+2005-12-17 Benjamin Kosnik <bkoz@redhat.com>
+
+ * src/io-inst.cc: Separate instantiations into...
+ * src/ios-inst.cc: .. this.
+ * src/iostream-inst.cc: ... and this.
+ * src/Makefile.am (sources): Update.
+ * src/Makefile.in: Regenerate.
+
+2005-12-17 Benjamin Kosnik <bkoz@redhat.com>
+
+ PR libstdc++/25472
+ * include/c_std/std_cstdlib.h: Fix for freestanding.
+
+2005-12-17 Benjamin Kosnik <bkoz@redhat.com>
+
+ * testsuite/libstdc++-dg/normal.exp: Rename to..
+ * testsuite/libstdc++-dg/conformance.exp: ... this.
+
2005-12-17 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_vector.h (vector(const vector&)): Use
#include <bits/c++config.h>
#include <cstddef>
-#if _GLIBCXX_HOSTED
-/* The C standard does not require a freestanding implementation to
- provide <stdlib.h>. However, the C++ standard does still require
- <cstdlib> -- but only the functionality mentioned in
- [lib.support.start.term]. */
+#if !_GLIBCXX_HOSTED
+// The C standard does not require a freestanding implementation to
+// provide <stdlib.h>. However, the C++ standard does still require
+// <cstdlib> -- but only the functionality mentioned in
+// [lib.support.start.term].
+
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
+
+namespace std
+{
+ extern "C" void abort(void);
+ extern "C" int atexit(void (*)());
+ extern "C" void exit(int);
+} // namespace std
+
+#else
+
#include <stdlib.h>
-#endif
// Get rid of those macros defined in <stdlib.h> in lieu of real functions.
#undef abort
namespace std
{
-#if _GLIBCXX_HOSTED
using ::div_t;
using ::ldiv_t;
inline ldiv_t
div(long __i, long __j) { return ldiv(__i, __j); }
-#else
- /* Provide the minimal set of definitions required of a freestanding
- implementation. */
- #define EXIT_SUCCESS 0
- #define EXIT_FAILURE 1
- extern "C" void abort(void);
- extern "C" int atexit(void (*)());
- extern "C" void exit(int);
-#endif
-}
+} // namespace std
#if _GLIBCXX_USE_C99
namespace std
{
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
- using __gnu_cxx::lldiv_t;
+ using ::__gnu_cxx::lldiv_t;
#endif
- using __gnu_cxx::_Exit;
- using __gnu_cxx::abs;
+ using ::__gnu_cxx::_Exit;
+ using ::__gnu_cxx::abs;
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
- using __gnu_cxx::llabs;
- using __gnu_cxx::div;
- using __gnu_cxx::lldiv;
+ using ::__gnu_cxx::llabs;
+ using ::__gnu_cxx::div;
+ using ::__gnu_cxx::lldiv;
#endif
- using __gnu_cxx::atoll;
- using __gnu_cxx::strtof;
- using __gnu_cxx::strtoll;
- using __gnu_cxx::strtoull;
- using __gnu_cxx::strtold;
+ using ::__gnu_cxx::atoll;
+ using ::__gnu_cxx::strtof;
+ using ::__gnu_cxx::strtoll;
+ using ::__gnu_cxx::strtoull;
+ using ::__gnu_cxx::strtold;
}
-#endif
+
+#endif // _GLIBCXX_USE_C99
+
+#endif // !_GLIBCXX_HOSTED
#endif
concept-inst.cc \
fstream-inst.cc \
ext-inst.cc \
- io-inst.cc \
+ ios-inst.cc \
+ iostream-inst.cc \
istream-inst.cc \
istream.cc \
locale-inst.cc \
list.lo locale.lo locale_init.lo locale_facets.lo \
localename.lo stdexcept.lo strstream.lo tree.lo \
allocator-inst.lo concept-inst.lo fstream-inst.lo ext-inst.lo \
- io-inst.lo istream-inst.lo istream.lo locale-inst.lo \
- locale-misc-inst.lo misc-inst.lo ostream-inst.lo \
- sstream-inst.lo streambuf-inst.lo streambuf.lo string-inst.lo \
- valarray-inst.lo wlocale-inst.lo wstring-inst.lo \
- $(am__objects_1) $(am__objects_2)
+ ios-inst.lo iostream-inst.lo istream-inst.lo istream.lo \
+ locale-inst.lo locale-misc-inst.lo misc-inst.lo \
+ ostream-inst.lo sstream-inst.lo streambuf-inst.lo streambuf.lo \
+ string-inst.lo valarray-inst.lo wlocale-inst.lo \
+ wstring-inst.lo $(am__objects_1) $(am__objects_2)
am_libstdc___la_OBJECTS = $(am__objects_3)
libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
concept-inst.cc \
fstream-inst.cc \
ext-inst.cc \
- io-inst.cc \
+ ios-inst.cc \
+ iostream-inst.cc \
istream-inst.cc \
istream.cc \
locale-inst.cc \
--- /dev/null
+// Explicit instantiation file.
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// 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.
+
+//
+// ISO C++ 14882:
+//
+
+#include <ios>
+
+namespace std
+{
+ template class basic_ios<char>;
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+ template class basic_ios<wchar_t>;
+#endif
+}
// Explicit instantiation file.
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// ISO C++ 14882:
//
-#include <ios>
+#include <iostream>
#include <iomanip>
namespace std
{
- // basic_ios
- template class basic_ios<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
- template class basic_ios<wchar_t>;
-#endif
-
- // iomanip
template class _Setfill<char>;
template _Setfill<char> setfill(char);
+ template class basic_iostream<char>;
+
#ifdef _GLIBCXX_USE_WCHAR_T
template class _Setfill<wchar_t>;
template _Setfill<wchar_t> setfill(wchar_t);
-#endif
-
- // iostream
- template class basic_iostream<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
template class basic_iostream<wchar_t>;
#endif
-} // namespace std
+}
projects / platform / upstream / gcc.git / commitdiff