c++config (_GLIBCXX_EXPORT_TEMPLATE): Remove.

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.

From-SVN: r169102

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d1ce8ed6cf67fce9ff4a9b2ae0e398ebd9056f70..be05727fd9ee3d72de69da1b02f512c9e60da308 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,26 @@
+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.
+
 2011-01-20  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * 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 71e7f28cdb6fc7f83f46dbb7c038d9bdbec3b572..6fd0653617bcef7176360419fa870bf7d0afc19d 100644 (file)
--- 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 <bits/basic_ios.tcc>
-#endif
 
 #endif /* _BASIC_IOS_H */

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 7465f364d496897706a93cc6fe547064a18a16ad..71774e82c276a9d01a874da5281c373e3a5dbc17 100644 (file)
--- 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 4756ac573af2ff58a1b93e3bebccc33b86b23865..3cdb1b3705f25c8979037bed34ee5594b8fd3894 100644 (file)
--- 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 <bits/locale_classes.tcc>
-#endif
 
 #endif

diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index bb0ba26a9dfe821826495eee206b49f0bb179f83..ec5a5188860814d088bb67083718e93fbec9f466 100644 (file)
--- 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 <bits/locale_facets.tcc>
-#endif
 
 #endif

diff --git a/libstdc++-v3/include/bits/locale_facets_nonio.h b/libstdc++-v3/include/bits/locale_facets_nonio.h
index 6d6af2b659e256fd81493eab177c7e37d6671e10..2c6a8f7cec7e948d0f840837820bf7ecb58631ce 100644 (file)
--- 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 <bits/codecvt.h>
 
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/locale_facets_nonio.tcc>
-#endif
+#include <bits/locale_facets_nonio.tcc>
 
 #endif

diff --git a/libstdc++-v3/include/bits/valarray_array.h b/libstdc++-v3/include/bits/valarray_array.h
index ae148ef5b529c45b2e97770d27e09d2cd126db55..46d5987736d445b61837673c8add5e4916cd43d0 100644 (file)
--- 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 <bits/valarray_array.tcc>
-#endif
 
 #endif /* _ARRAY_H */

diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h
index 733a2c6a0a7c4b88264b9e052923eb4dc9a1dbb9..127c3ba72d40705a88db1242a8afbb229f9fb2f2 100644 (file)
--- 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 <debug/safe_iterator.tcc>
-#endif
+#include <debug/safe_iterator.tcc>
 
 #endif

diff --git a/libstdc++-v3/include/debug/safe_sequence.h b/libstdc++-v3/include/debug/safe_sequence.h
index 843c9b11710e2ae4589fd690a0b7e61ac465216a..cc1f4c10df2e3fae0f009e9e6598cb440c086042 100644 (file)
--- 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 <debug/safe_sequence.tcc>
-#endif
+#include <debug/safe_sequence.tcc>
 
 #endif

diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h
index 3700f3ee587d278e1919e1b5b05e5e08ae76d851..735e82c64188110bd67b173e77f35370445bcc2a 100644 (file)
--- 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 7af2b8e086681a4ca6297343df26afb2fabf8a8e..7b0604bf9084dfd4b88b2151829da1552310ddd8 100644 (file)
--- a/libstdc++-v3/include/std/deque
+++ b/libstdc++-v3/include/std/deque
@@ -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,10 +64,7 @@
 #include <bits/stl_uninitialized.h>
 #include <bits/stl_deque.h>
 #include <bits/range_access.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/deque.tcc>
-#endif
+#include <bits/deque.tcc>
 
 #ifdef _GLIBCXX_DEBUG
 # include <debug/deque>

diff --git a/libstdc++-v3/include/std/forward_list b/libstdc++-v3/include/std/forward_list
index 5378e545e2a26429a28d1d6e3204bb31af487098..a1befcf4bdb3e7b0593a7975e18c35ab606fc5fb 100644 (file)
--- a/libstdc++-v3/include/std/forward_list
+++ b/libstdc++-v3/include/std/forward_list
@@ -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,10 +37,7 @@
 
 #include <bits/forward_list.h>
 #include <bits/range_access.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/forward_list.tcc>
-#endif
+#include <bits/forward_list.tcc>
 
 #ifdef _GLIBCXX_DEBUG
 # include <debug/forward_list>

diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index ee31fc12b65c521b1de8f483b3ad194f8245515d..64623f5ba96cfafecd23dc9b5882d407693a7946 100644 (file)
--- 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 <bits/fstream.tcc>
-#endif
+#include <bits/fstream.tcc>
 
 #endif /* _GLIBCXX_FSTREAM */

diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream
index df75718ae1015039a109f72f1f32570058d6fced..7b6d1520bf216a17e15fed1748e83bed20fc978b 100644 (file)
--- 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 <bits/istream.tcc>
-#endif
+#include <bits/istream.tcc>
 
 #endif /* _GLIBCXX_ISTREAM */

diff --git a/libstdc++-v3/include/std/list b/libstdc++-v3/include/std/list
index 177b9a9bae99fca943d153a7a4a22247491c8b66..abcba859b0b8bad4f6606899016c323c8c85ea43 100644 (file)
--- a/libstdc++-v3/include/std/list
+++ b/libstdc++-v3/include/std/list
@@ -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,12 +60,9 @@
 
 #include <bits/stl_algobase.h>
 #include <bits/allocator.h>
-#include <bits/stl_list.h>
 #include <bits/range_access.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/list.tcc>
-#endif
+#include <bits/stl_list.h>
+#include <bits/list.tcc>
 
 #ifdef _GLIBCXX_DEBUG
 # include <debug/list>

diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 632a0e0414e847316658fc8518e131c3fdeed2d1..b25bdb0f5bc4daed6635ddd27e05e2e4f5e2057b 100644 (file)
--- 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 <bits/ostream.tcc>
-#endif
+#include <bits/ostream.tcc>
 
 #endif /* _GLIBCXX_OSTREAM */

diff --git a/libstdc++-v3/include/std/random b/libstdc++-v3/include/std/random
index 4d330eedd9258461d45e85673394482fd5d88664..59aed8ef9d1f006f870ade9b8b0e6f444116cd35 100644 (file)
--- a/libstdc++-v3/include/std/random
+++ b/libstdc++-v3/include/std/random
@@ -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,12 +47,8 @@
 #ifdef _GLIBCXX_USE_C99_STDINT_TR1
 
 #include <cstdint> // For uint_fast32_t, uint_fast64_t, uint_least32_t
-
 #include <bits/random.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/random.tcc>
-#endif
+#include <bits/random.tcc>
 
 #endif // _GLIBCXX_USE_C99_STDINT_TR1
 

diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream
index 7f9091c81fca4f1302a971c37026c940ac960318..c30a5b74b16def75d0e17643e95c085ce752e568 100644 (file)
--- 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 <bits/sstream.tcc>
-#endif
+#include <bits/sstream.tcc>
 
 #endif /* _GLIBCXX_SSTREAM */

diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf
index e95a7523dca23390625b075c49bd35c41cd97443..9b05e04af210ffb7a781de8667832e2be51c0807 100644 (file)
--- 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 <bits/streambuf.tcc>
-#endif
+#include <bits/streambuf.tcc>
 
 #endif /* _GLIBCXX_STREAMBUF */

diff --git a/libstdc++-v3/include/std/string b/libstdc++-v3/include/std/string
index 8f6dd74f7baa2058d06d76b630c9c1f8769cbcb4..28933961a19714908b7d4bc15e5846bc4cb72f96 100644 (file)
--- 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 <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>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/basic_string.tcc> 
-#endif
+#include <bits/basic_string.h>
+#include <bits/basic_string.tcc> 
 
 #endif /* _GLIBCXX_STRING */

diff --git a/libstdc++-v3/include/tr1/random b/libstdc++-v3/include/tr1/random
index b703d030ac46dfe7805144ab556e0874dbdb58df..55926479affaab75ce47846f5ce2255703017bea 100644 (file)
--- 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 <debug/debug.h>
 #include <tr1/type_traits>
 #include <tr1/cmath>
-
 #include <tr1/random.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <tr1/random.tcc>
-#endif
+#include <tr1/random.tcc>
 
 #endif // _GLIBCXX_TR1_RANDOM