From ee3ee948de7684e4542acd501239fd4105ad4221 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 21 Jan 2011 19:41:13 +0000 Subject: [PATCH] c++config (_GLIBCXX_EXPORT_TEMPLATE): Remove. 2011-01-21 Benjamin Kosnik * include/bits/c++config (_GLIBCXX_EXPORT_TEMPLATE): Remove. * include/debug/safe_sequence.h: Same. * include/debug/safe_iterator.h: Same. * include/std/forward_list: Same. * include/std/deque: Same. * include/std/list: Same. * include/std/random: Same. * include/std/streambuf: Same. * include/std/fstream: Same. * include/std/istream: Same. * include/std/string: Same. * include/std/ostream: Same. * include/std/sstream: Same. * include/ext/vstring.h: Same. * include/bits/basic_ios.h: Same. * include/bits/locale_classes.h: Same. * include/bits/locale_facets.h: Same. * include/bits/valarray_array.h: Same. * include/bits/locale_facets_nonio.h: Same. * include/tr1/random: Same. From-SVN: r169102 --- libstdc++-v3/ChangeLog | 23 +++++++++++++++++++ libstdc++-v3/include/bits/basic_ios.h | 4 +--- libstdc++-v3/include/bits/c++config | 4 ---- libstdc++-v3/include/bits/locale_classes.h | 4 +--- libstdc++-v3/include/bits/locale_facets.h | 4 +--- .../include/bits/locale_facets_nonio.h | 6 ++--- libstdc++-v3/include/bits/valarray_array.h | 4 +--- libstdc++-v3/include/debug/safe_iterator.h | 6 ++--- libstdc++-v3/include/debug/safe_sequence.h | 6 ++--- libstdc++-v3/include/ext/vstring.h | 6 ++--- libstdc++-v3/include/std/deque | 7 ++---- libstdc++-v3/include/std/forward_list | 7 ++---- libstdc++-v3/include/std/fstream | 6 ++--- libstdc++-v3/include/std/istream | 6 ++--- libstdc++-v3/include/std/list | 9 +++----- libstdc++-v3/include/std/ostream | 6 ++--- libstdc++-v3/include/std/random | 8 ++----- libstdc++-v3/include/std/sstream | 6 ++--- libstdc++-v3/include/std/streambuf | 6 ++--- libstdc++-v3/include/std/string | 9 +++----- libstdc++-v3/include/tr1/random | 8 ++----- 21 files changed, 59 insertions(+), 86 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d1ce8ed6cf6..be05727fd9e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,26 @@ +2011-01-21 Benjamin Kosnik + + * include/bits/c++config (_GLIBCXX_EXPORT_TEMPLATE): Remove. + * include/debug/safe_sequence.h: Same. + * include/debug/safe_iterator.h: Same. + * include/std/forward_list: Same. + * include/std/deque: Same. + * include/std/list: Same. + * include/std/random: Same. + * include/std/streambuf: Same. + * include/std/fstream: Same. + * include/std/istream: Same. + * include/std/string: Same. + * include/std/ostream: Same. + * include/std/sstream: Same. + * include/ext/vstring.h: Same. + * include/bits/basic_ios.h: Same. + * include/bits/locale_classes.h: Same. + * include/bits/locale_facets.h: Same. + * include/bits/valarray_array.h: Same. + * include/bits/locale_facets_nonio.h: Same. + * include/tr1/random: Same. + 2011-01-20 Jonathan Wakely * doc/xml/manual/diagnostics.xml: Replace note about C++0x concepts. diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h index 71e7f28cdb6..6fd0653617b 100644 --- a/libstdc++-v3/include/bits/basic_ios.h +++ b/libstdc++-v3/include/bits/basic_ios.h @@ -1,7 +1,7 @@ // Iostreams base classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -467,8 +467,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE #include -#endif #endif /* _BASIC_IOS_H */ diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 7465f364d49..71774e82c27 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -359,10 +359,6 @@ namespace std #define _GLIBCXX_PSEUDO_VISIBILITY(V) #endif -// Allow use of "export template." This is currently not a feature -// that g++ supports. -// #define _GLIBCXX_EXPORT_TEMPLATE 1 - // Allow use of the GNU syntax extension, "extern template." This // extension is fully documented in the g++ manual, but in a nutshell, // it inhibits all implicit instantiations and is used throughout the diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h index 4756ac573af..3cdb1b3705f 100644 --- a/libstdc++-v3/include/bits/locale_classes.h +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -1,7 +1,7 @@ // Locale support -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -817,8 +817,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE # include -#endif #endif diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index bb0ba26a9df..ec5a5188860 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -1,7 +1,7 @@ // Locale support -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -2599,8 +2599,6 @@ _GLIBCXX_END_LDBL_NAMESPACE _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE # include -#endif #endif diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h index 6d6af2b659e..2c6a8f7cec7 100644 --- a/libstdc++-v3/include/bits/locale_facets_nonio.h +++ b/libstdc++-v3/include/bits/locale_facets_nonio.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -1927,8 +1927,6 @@ _GLIBCXX_END_NAMESPACE // 22.2.1.5 Template class codecvt #include -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h index ae148ef5b52..46d5987736d 100644 --- a/libstdc++-v3/include/bits/valarray_array.h +++ b/libstdc++-v3/include/bits/valarray_array.h @@ -1,7 +1,7 @@ // The template and inlines for the -*- C++ -*- internal _Array helper class. // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -687,8 +687,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE # include -#endif #endif /* _ARRAY_H */ diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 733a2c6a0a7..127c3ba72d4 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -1,6 +1,6 @@ // Safe iterator implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 +// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -684,8 +684,6 @@ namespace __gnu_debug { return _Siter_base<_Iterator>::_S_base(__it); } } // namespace __gnu_debug -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif diff --git a/libstdc++-v3/include/debug/safe_sequence.h b/libstdc++-v3/include/debug/safe_sequence.h index 843c9b11710..cc1f4c10df2 100644 --- a/libstdc++-v3/include/debug/safe_sequence.h +++ b/libstdc++-v3/include/debug/safe_sequence.h @@ -1,6 +1,6 @@ // Safe sequence implementation -*- C++ -*- -// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 +// Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -130,8 +130,6 @@ namespace __gnu_debug }; } // namespace __gnu_debug -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index 3700f3ee587..735e82c6418 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -1,6 +1,6 @@ // Versatile string -*- C++ -*- -// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -2722,8 +2722,6 @@ _GLIBCXX_END_NAMESPACE #endif -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include "vstring.tcc" -#endif +#include "vstring.tcc" #endif /* _VSTRING_H */ diff --git a/libstdc++-v3/include/std/deque b/libstdc++-v3/include/std/deque index 7af2b8e0866..7b0604bf908 100644 --- a/libstdc++-v3/include/std/deque +++ b/libstdc++-v3/include/std/deque @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -64,10 +64,7 @@ #include #include #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #ifdef _GLIBCXX_DEBUG # include diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list index 5378e545e2a..a1befcf4bdb 100644 --- a/libstdc++-v3/include/std/forward_list +++ b/libstdc++-v3/include/std/forward_list @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2008, 2009, 2010, 2011 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 @@ -37,10 +37,7 @@ #include #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #ifdef _GLIBCXX_DEBUG # include diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index ee31fc12b65..64623f5ba96 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -1,7 +1,7 @@ // File based streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -915,8 +915,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif /* _GLIBCXX_FSTREAM */ diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index df75718ae10..7b6d1520bf2 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -1,7 +1,7 @@ // Input streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -850,8 +850,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif /* _GLIBCXX_ISTREAM */ diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list index 177b9a9bae9..abcba859b0b 100644 --- a/libstdc++-v3/include/std/list +++ b/libstdc++-v3/include/std/list @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -60,12 +60,9 @@ #include #include -#include #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include +#include #ifdef _GLIBCXX_DEBUG # include diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index 632a0e0414e..b25bdb0f5bc 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -1,7 +1,7 @@ // Output streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 +// 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -582,8 +582,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif /* _GLIBCXX_OSTREAM */ diff --git a/libstdc++-v3/include/std/random b/libstdc++-v3/include/std/random index 4d330eedd92..59aed8ef9d1 100644 --- a/libstdc++-v3/include/std/random +++ b/libstdc++-v3/include/std/random @@ -1,6 +1,6 @@ // -*- C++ -*- -// Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008, 2009, 2010, 2011 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 @@ -47,12 +47,8 @@ #ifdef _GLIBCXX_USE_C99_STDINT_TR1 #include // For uint_fast32_t, uint_fast64_t, uint_least32_t - #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif // _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index 7f9091c81fc..c30a5b74b16 100644 --- a/libstdc++-v3/include/std/sstream +++ b/libstdc++-v3/include/std/sstream @@ -1,7 +1,7 @@ // String based streams -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2008, 2009, 2010 Free Software Foundation, Inc. +// 2006, 2008, 2009, 2010, 2011 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 @@ -569,8 +569,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif /* _GLIBCXX_SSTREAM */ diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index e95a7523dca..9b05e04af21 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -1,7 +1,7 @@ // Stream buffer classes -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +// 2006, 2007, 2008, 2009, 2010, 2011 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 @@ -795,8 +795,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std) _GLIBCXX_END_NAMESPACE -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif /* _GLIBCXX_STREAMBUF */ diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/string index 8f6dd74f7ba..28933961a19 100644 --- a/libstdc++-v3/include/std/string +++ b/libstdc++-v3/include/std/string @@ -1,7 +1,7 @@ // Components for manipulating sequences of characters -*- C++ -*- // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -// 2005, 2006, 2007, 2009, 2010 +// 2005, 2006, 2007, 2009, 2010, 2011 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -50,11 +50,8 @@ #include // For less #include #include -#include #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include +#include #endif /* _GLIBCXX_STRING */ diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random index b703d030ac4..55926479aff 100644 --- a/libstdc++-v3/include/tr1/random +++ b/libstdc++-v3/include/tr1/random @@ -1,6 +1,6 @@ // random number generation -*- C++ -*- -// Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright (C) 2006, 2007, 2008, 2009, 2011 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 @@ -44,11 +44,7 @@ #include #include #include - #include - -#ifndef _GLIBCXX_EXPORT_TEMPLATE -# include -#endif +#include #endif // _GLIBCXX_TR1_RANDOM -- 2.30.2