Commit bfd7f4ec by Mark Mitchell Committed by Mark Mitchell

Makefile.am (sources): Add globals.cc.

	* src/Makefile.am (sources): Add globals.cc.
	* src/Makefile.in: Regenerated.
	* src/globals.cc: New file.
	* src/ios.cc (cin): Don't define here, just declare extern.
	(cout): Likewise.
	(cerr): Likewise.
	(clog): Likewise.
	(wcin): Likewise.
	(wcout): Likewise.
	(wcerr): Likewise.
	(wclog): Likewise.

From-SVN: r39275
parent c4faeb92
2001-01-25 Mark Mitchell <mark@codesourcery.com>
* src/Makefile.am (sources): Add globals.cc.
* src/Makefile.in: Regenerated.
* src/globals.cc: New file.
* src/ios.cc (cin): Don't define here, just declare extern.
(cout): Likewise.
(cerr): Likewise.
(clog): Likewise.
(wcin): Likewise.
(wcout): Likewise.
(wcerr): Likewise.
(wclog): Likewise.
2001-01-25 Phil Edwards <pme@sources.redhat.com> 2001-01-25 Phil Edwards <pme@sources.redhat.com>
* include/bits/std_iterator.h: Do not include stl_relops.h. * include/bits/std_iterator.h: Do not include stl_relops.h.
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA. ## USA.
## $Id: Makefile.am,v 1.63 2001/01/10 17:24:11 bkoz Exp $ ## $Id: Makefile.am,v 1.64 2001/01/11 07:27:49 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1 MAINT_CHARSET = latin1
...@@ -176,6 +176,7 @@ sources = \ ...@@ -176,6 +176,7 @@ sources = \
limitsMEMBERS.cc \ limitsMEMBERS.cc \
complex_io.cc \ complex_io.cc \
stdexcept.cc bitset.cc \ stdexcept.cc bitset.cc \
globals.cc \
c++io.cc ios.cc strstream.cc \ c++io.cc ios.cc strstream.cc \
locale.cc localename.cc codecvt.cc \ locale.cc localename.cc codecvt.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
......
...@@ -170,7 +170,7 @@ std_headers = algorithm bitset complex deque fstream functional iomanip ios i ...@@ -170,7 +170,7 @@ std_headers = algorithm bitset complex deque fstream functional iomanip ios i
build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++threads.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
sources = limitsMEMBERS.cc complex_io.cc stdexcept.cc bitset.cc c++io.cc ios.cc strstream.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc sources = limitsMEMBERS.cc complex_io.cc stdexcept.cc bitset.cc globals.cc c++io.cc ios.cc strstream.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
wstring_sources = wstring-inst.cc wstring_sources = wstring-inst.cc
...@@ -259,9 +259,9 @@ libinst_wstring_la_LDFLAGS = ...@@ -259,9 +259,9 @@ libinst_wstring_la_LDFLAGS =
libinst_wstring_la_LIBADD = libinst_wstring_la_LIBADD =
libinst_wstring_la_OBJECTS = wstring-inst.lo libinst_wstring_la_OBJECTS = wstring-inst.lo
libstdc___la_OBJECTS = limitsMEMBERS.lo complex_io.lo stdexcept.lo \ libstdc___la_OBJECTS = limitsMEMBERS.lo complex_io.lo stdexcept.lo \
bitset.lo c++io.lo ios.lo strstream.lo locale.lo localename.lo \ bitset.lo globals.lo c++io.lo ios.lo strstream.lo locale.lo \
codecvt.lo locale-inst.lo stl-inst.lo misc-inst.lo valarray-inst.lo \ localename.lo codecvt.lo locale-inst.lo stl-inst.lo misc-inst.lo \
string-inst.lo valarray-inst.lo string-inst.lo
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX) CXXLD = $(CXX)
......
// Copyright (C) 2001 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// As a special exception, you may use this file as part of a free software
// library without restriction. Specifically, if other files instantiate
// templates or use macros or inline functions from this file, or you compile
// this file and link it with other files to produce an executable, this
// file does not by itself cause the resulting executable to be covered by
// the GNU General Public License. This exception does not however
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
// On AIX, and perhaps other systems, library initialization order
// is not guaranteed. For example, the static initializers for the
// main program might run before the static initializers for this
// library. That means that we cannot rely on static initialization in
// the library; there is no guarantee that things will get initialized
// in time. This file contains definitions of all global variables
// that require initialization as arrays of characters.
#include <istream>
#include <ostream>
namespace std {
typedef char fake_istream[sizeof (istream)]
__attribute__ ((aligned (__alignof__ (istream))));
typedef char fake_ostream[sizeof (ostream)]
__attribute__ ((aligned (__alignof__ (ostream))));
fake_istream cin;
fake_ostream cout;
fake_ostream cerr;
fake_ostream clog;
#ifdef _GLIBCPP_USE_WCHAR_T
typedef char fake_wistream[sizeof (wistream)]
__attribute__ ((aligned (__alignof__ (wistream))));
typedef char fake_wostream[sizeof (wostream)]
__attribute__ ((aligned (__alignof__ (wostream))));
fake_wistream wcin;
fake_wostream wcout;
fake_wostream wcerr;
fake_wostream wclog;
#endif
}
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <bits/std_ostream.h> #include <bits/std_ostream.h>
#include <bits/std_istream.h> #include <bits/std_istream.h>
#include <bits/std_fstream.h> #include <bits/std_fstream.h>
#include <stdio.h>
namespace std namespace std
{ {
...@@ -109,15 +110,15 @@ namespace std ...@@ -109,15 +110,15 @@ namespace std
int ios_base::Init::_S_ios_base_init = 0; int ios_base::Init::_S_ios_base_init = 0;
bool ios_base::Init::_S_synced_with_stdio = true; bool ios_base::Init::_S_synced_with_stdio = true;
istream cin(NULL); extern istream cin;
ostream cout(NULL); extern ostream cout;
ostream cerr(NULL); extern ostream cerr;
ostream clog(NULL); extern ostream clog;
#ifdef _GLIBCPP_USE_WCHAR_T #ifdef _GLIBCPP_USE_WCHAR_T
wistream wcin(NULL); extern wistream wcin;
wostream wcout(NULL); extern wostream wcout;
wostream wcerr(NULL); extern wostream wcerr;
wostream wclog(NULL); extern wostream wclog;
#endif #endif
ios_base::failure::failure(const string& __str) throw() ios_base::failure::failure(const string& __str) throw()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment