Patchwork [v3] remove export macros

login
register
mail settings
Submitter Benjamin Kosnik
Date Jan. 21, 2011, 8:01 p.m.
Message ID <20110121120112.656f5ee7@shotwell>
Download mbox | patch
Permalink /patch/79915/
State New
Headers show

Comments

Benjamin Kosnik - Jan. 21, 2011, 8:01 p.m.
Never used in c++03, removed in c++0x.

tested x86_64/linux

-benjamin

Patch

2011-01-21  Benjamin Kosnik  <bkoz@redhat.com>

	* 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.

Index: include/debug/safe_sequence.h
===================================================================
--- include/debug/safe_sequence.h	(revision 169098)
+++ include/debug/safe_sequence.h	(working copy)
@@ -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
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-#  include <debug/safe_sequence.tcc>
-#endif
+#include <debug/safe_sequence.tcc>
 
 #endif
Index: include/debug/safe_iterator.h
===================================================================
--- include/debug/safe_iterator.h	(revision 169098)
+++ include/debug/safe_iterator.h	(working copy)
@@ -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 @@ 
     { return _Siter_base<_Iterator>::_S_base(__it); }
 } // namespace __gnu_debug
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-#  include <debug/safe_iterator.tcc>
-#endif
+#include <debug/safe_iterator.tcc>
 
 #endif
Index: include/std/forward_list
===================================================================
--- include/std/forward_list	(revision 169098)
+++ include/std/forward_list	(working copy)
@@ -1,6 +1,6 @@ 
 // <forward_list> -*- 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,11 +37,8 @@ 
 
 #include <bits/forward_list.h>
 #include <bits/range_access.h>
+#include <bits/forward_list.tcc>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/forward_list.tcc>
-#endif
-
 #ifdef _GLIBCXX_DEBUG
 # include <debug/forward_list>
 #endif
Index: include/std/deque
===================================================================
--- include/std/deque	(revision 169098)
+++ include/std/deque	(working copy)
@@ -1,6 +1,6 @@ 
 // <deque> -*- 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,11 +64,8 @@ 
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_deque.h>
 #include <bits/range_access.h>
+#include <bits/deque.tcc>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/deque.tcc>
-#endif
-
 #ifdef _GLIBCXX_DEBUG
 # include <debug/deque>
 #endif
Index: include/std/list
===================================================================
--- include/std/list	(revision 169098)
+++ include/std/list	(working copy)
@@ -1,6 +1,6 @@ 
 // <list> -*- 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,13 +60,10 @@ 
 
 #include <bits/stl_algobase.h>
 #include <bits/allocator.h>
-#include <bits/stl_list.h>
 #include <bits/range_access.h>
+#include <bits/stl_list.h>
+#include <bits/list.tcc>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/list.tcc>
-#endif
-
 #ifdef _GLIBCXX_DEBUG
 # include <debug/list>
 #endif
Index: include/std/random
===================================================================
--- include/std/random	(revision 169098)
+++ include/std/random	(working copy)
@@ -1,6 +1,6 @@ 
 // <random> -*- 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,13 +47,9 @@ 
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
 
 #include <cstdint> // For uint_fast32_t, uint_fast64_t, uint_least32_t
-
 #include <bits/random.h>
+#include <bits/random.tcc>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/random.tcc>
-#endif
-
 #endif // _GLIBCXX_USE_C99_STDINT_TR1
 
 #endif // __GXX_EXPERIMENTAL_CXX0X__
Index: include/std/streambuf
===================================================================
--- include/std/streambuf	(revision 169098)
+++ include/std/streambuf	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/streambuf.tcc>
-#endif
+#include <bits/streambuf.tcc>
 
 #endif /* _GLIBCXX_STREAMBUF */
Index: include/std/fstream
===================================================================
--- include/std/fstream	(revision 169098)
+++ include/std/fstream	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/fstream.tcc>
-#endif
+#include <bits/fstream.tcc>
 
 #endif /* _GLIBCXX_FSTREAM */
Index: include/std/istream
===================================================================
--- include/std/istream	(revision 169098)
+++ include/std/istream	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/istream.tcc>
-#endif
+#include <bits/istream.tcc>
 
 #endif	/* _GLIBCXX_ISTREAM */
Index: include/std/string
===================================================================
--- include/std/string	(revision 169098)
+++ include/std/string	(working copy)
@@ -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 <bits/stl_function.h> // For less
 #include <ext/numeric_traits.h> 
 #include <bits/stl_algobase.h> 
-#include <bits/basic_string.h>
 #include <bits/range_access.h>
+#include <bits/basic_string.h>
+#include <bits/basic_string.tcc> 
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/basic_string.tcc> 
-#endif
-
 #endif /* _GLIBCXX_STRING */
Index: include/std/ostream
===================================================================
--- include/std/ostream	(revision 169098)
+++ include/std/ostream	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/ostream.tcc>
-#endif
+#include <bits/ostream.tcc>
 
 #endif	/* _GLIBCXX_OSTREAM */
Index: include/std/sstream
===================================================================
--- include/std/sstream	(revision 169098)
+++ include/std/sstream	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/sstream.tcc>
-#endif
+#include <bits/sstream.tcc>
 
 #endif /* _GLIBCXX_SSTREAM */
Index: include/ext/vstring.h
===================================================================
--- include/ext/vstring.h	(revision 169098)
+++ include/ext/vstring.h	(working copy)
@@ -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 @@ 
 
 #endif
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include "vstring.tcc" 
-#endif
+#include "vstring.tcc" 
 
 #endif /* _VSTRING_H */
Index: include/bits/basic_ios.h
===================================================================
--- include/bits/basic_ios.h	(revision 169098)
+++ include/bits/basic_ios.h	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
 #include <bits/basic_ios.tcc>
-#endif
 
 #endif /* _BASIC_IOS_H */
Index: include/bits/locale_classes.h
===================================================================
--- include/bits/locale_classes.h	(revision 169098)
+++ include/bits/locale_classes.h	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
 # include <bits/locale_classes.tcc>
-#endif
 
 #endif
Index: include/bits/locale_facets.h
===================================================================
--- include/bits/locale_facets.h	(revision 169098)
+++ include/bits/locale_facets.h	(working copy)
@@ -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_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
 # include <bits/locale_facets.tcc>
-#endif
 
 #endif
Index: include/bits/c++config
===================================================================
--- include/bits/c++config	(revision 169098)
+++ include/bits/c++config	(working copy)
@@ -359,10 +359,6 @@ 
 #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
Index: include/bits/valarray_array.h
===================================================================
--- include/bits/valarray_array.h	(revision 169098)
+++ include/bits/valarray_array.h	(working copy)
@@ -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_END_NAMESPACE
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
 # include <bits/valarray_array.tcc>
-#endif
 
 #endif /* _ARRAY_H */
Index: include/bits/locale_facets_nonio.h
===================================================================
--- include/bits/locale_facets_nonio.h	(revision 169098)
+++ include/bits/locale_facets_nonio.h	(working copy)
@@ -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 @@ 
 // 22.2.1.5  Template class codecvt
 #include <bits/codecvt.h>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/locale_facets_nonio.tcc>
-#endif
+#include <bits/locale_facets_nonio.tcc>
 
 #endif
Index: include/tr1/random
===================================================================
--- include/tr1/random	(revision 169098)
+++ include/tr1/random	(working copy)
@@ -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 <debug/debug.h>
 #include <tr1/type_traits>
 #include <tr1/cmath>
-
 #include <tr1/random.h>
+#include <tr1/random.tcc>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <tr1/random.tcc>
-#endif
-
 #endif // _GLIBCXX_TR1_RANDOM