summaryrefslogtreecommitdiffstats
path: root/libstdc++-v3/include/std/string
diff options
context:
space:
mode:
authorbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-21 19:41:13 +0000
committerbkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-21 19:41:13 +0000
commit74642da2f83056438620d51dcc6bd3a50c0b7774 (patch)
treea3dfa1fe8287894a806cbcb83ffe8fdaf14abc80 /libstdc++-v3/include/std/string
parente30ff7b1ab5258353b65e688d90789dfb6f80d1e (diff)
downloadppe42-gcc-74642da2f83056438620d51dcc6bd3a50c0b7774.tar.gz
ppe42-gcc-74642da2f83056438620d51dcc6bd3a50c0b7774.zip
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169102 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/string')
-rw-r--r--libstdc++-v3/include/std/string9
1 files changed, 3 insertions, 6 deletions
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 <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 */
OpenPOWER on IntegriCloud