diff options
Diffstat (limited to 'libstdc++-v3/include/std')
27 files changed, 198 insertions, 80 deletions
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index 3cad7e8f5ad..a0bdd24a85a 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -38,7 +38,9 @@ #include <bits/stl_algobase.h> #include <bits/range_access.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief A standard container for storing a fixed size sequence of elements. @@ -264,7 +266,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) get(const array<_Tp, _Nm>& __arr) { return __arr[_Int]; } -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 71cd4445e11..aafa28243e1 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -42,7 +42,9 @@ #include <bits/atomic_0.h> #include <bits/atomic_2.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @addtogroup atomics @@ -1347,6 +1349,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // @} group atomics -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 29b06d52e72..e0e8f1340f4 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -57,7 +57,9 @@ ((__n) / _GLIBCXX_BITSET_BITS_PER_WORD + \ ((__n) % _GLIBCXX_BITSET_BITS_PER_WORD == 0 ? 0 : 1)) -_GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_CONTAINER /** * Base class, general case. It is a class invariant that _Nw will be @@ -1502,7 +1504,8 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D) } //@} -_GLIBCXX_END_NESTED_NAMESPACE +_GLIBCXX_END_NAMESPACE_CONTAINER +} // namespace std #undef _GLIBCXX_BITSET_WORDS #undef _GLIBCXX_BITSET_BITS_PER_WORD @@ -1511,16 +1514,18 @@ _GLIBCXX_END_NESTED_NAMESPACE #include <bits/functional_hash.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // DR 1182. /// std::hash specialization for bitset. template<size_t _Nb> - struct hash<_GLIBCXX_STD_D::bitset<_Nb>> - : public __hash_base<size_t, _GLIBCXX_STD_D::bitset<_Nb>> + struct hash<_GLIBCXX_STD_C::bitset<_Nb>> + : public __hash_base<size_t, _GLIBCXX_STD_C::bitset<_Nb>> { size_t - operator()(const _GLIBCXX_STD_D::bitset<_Nb>& __b) const + operator()(const _GLIBCXX_STD_C::bitset<_Nb>& __b) const { const size_t __clength = (_Nb + __CHAR_BIT__ - 1) / __CHAR_BIT__; return std::_Hash_impl::hash(__b._M_getdata(), __clength); @@ -1528,15 +1533,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) }; template<> - struct hash<_GLIBCXX_STD_D::bitset<0>> - : public __hash_base<size_t, _GLIBCXX_STD_D::bitset<0>> + struct hash<_GLIBCXX_STD_C::bitset<0>> + : public __hash_base<size_t, _GLIBCXX_STD_C::bitset<0>> { size_t - operator()(const _GLIBCXX_STD_D::bitset<0>&) const + operator()(const _GLIBCXX_STD_C::bitset<0>&) const { return 0; } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index b93671f3855..89ded2c80d4 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -42,8 +42,8 @@ #ifdef _GLIBCXX_USE_C99_STDINT_TR1 -_GLIBCXX_BEGIN_NAMESPACE(std) - +namespace std _GLIBCXX_VISIBILITY(default) +{ /** * @defgroup chrono Time * @ingroup utilities @@ -57,13 +57,18 @@ _GLIBCXX_BEGIN_NAMESPACE(std) */ namespace chrono { + _GLIBCXX_BEGIN_NAMESPACE_VERSION + template<typename _Rep, typename _Period = ratio<1>> struct duration; template<typename _Clock, typename _Dur = typename _Clock::duration> struct time_point; + + _GLIBCXX_END_NAMESPACE_VERSION } +_GLIBCXX_BEGIN_NAMESPACE_VERSION // 20.8.2.3 specialization of common_type (for duration) template<typename _Rep1, typename _Period1, typename _Rep2, typename _Period2> struct common_type<chrono::duration<_Rep1, _Period1>, @@ -91,9 +96,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) public: typedef chrono::time_point<_Clock, __ct> type; }; +_GLIBCXX_END_NAMESPACE_VERSION namespace chrono { + _GLIBCXX_BEGIN_NAMESPACE_VERSION + // Primary template for duration_cast impl. template<typename _ToDur, typename _CF, typename _CR, bool _NumIsOne = false, bool _DenIsOne = false> @@ -212,7 +220,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<typename _Rep, typename _Period> struct duration { - typedef _Rep rep; + typedef _Rep rep; typedef _Period period; static_assert(!__is_duration<_Rep>::value, "rep cannot be a duration"); @@ -649,7 +657,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #elif defined(_GLIBCXX_USE_GETTIMEOFDAY) typedef chrono::microseconds duration; #else - typedef chrono::seconds duration; + typedef chrono::seconds duration; #endif typedef duration::rep rep; @@ -687,8 +695,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) struct monotonic_clock { typedef chrono::nanoseconds duration; - typedef duration::rep rep; - typedef duration::period period; + typedef duration::rep rep; + typedef duration::period period; typedef chrono::time_point<monotonic_clock, duration> time_point; static constexpr bool is_monotonic = true; @@ -701,10 +709,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif typedef system_clock high_resolution_clock; + + _GLIBCXX_END_NAMESPACE_VERSION } // namespace chrono // @} group chrono -_GLIBCXX_END_NAMESPACE +} // namespace #endif //_GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 4bd8e8c42e1..d36eddca5a6 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -46,7 +46,9 @@ #include <cmath> #include <sstream> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup complex_numbers Complex Numbers @@ -1494,9 +1496,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // @} group complex_numbers -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace -_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) +namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // See ext/type_traits.h for the primary template. template<typename _Tp, typename _Up> @@ -1520,11 +1525,14 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) typedef std::complex<typename __promote_2<_Tp, _Up>::__type> __type; }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #ifdef __GXX_EXPERIMENTAL_CXX0X__ -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // Forward declarations. template<typename _Tp> std::complex<_Tp> acos(const std::complex<_Tp>&); @@ -1890,7 +1898,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) conj(_Tp __x) { return __x; } -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/condition_variable b/libstdc++-v3/include/std/condition_variable index 6b46fe71d8f..a0a3c08794a 100644 --- a/libstdc++-v3/include/std/condition_variable +++ b/libstdc++-v3/include/std/condition_variable @@ -40,7 +40,9 @@ #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup condition_variables Condition Variables @@ -254,7 +256,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) }; // @} group condition_variables -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream index 64623f5ba96..8ad6e5ca11a 100644 --- a/libstdc++-v3/include/std/fstream +++ b/libstdc++-v3/include/std/fstream @@ -46,7 +46,9 @@ #include <string> // For std::string overloads. #endif -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.8.1.1] template class basic_filebuf /** @@ -913,7 +915,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/fstream.tcc> diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index a781dbee28f..3ae95502341 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -1,7 +1,7 @@ // <functional> -*- C++ -*- -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -// Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 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 // software; you can redistribute it and/or modify it under the @@ -58,7 +58,9 @@ #include <bits/functexcept.h> #include <bits/functional_hash.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_HAS_NESTED_TYPE(result_type) @@ -835,6 +837,8 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) /// The type of placeholder objects defined by libstdc++. template<int _Num> struct _Placeholder { }; + _GLIBCXX_END_NAMESPACE_VERSION + /** @namespace std::placeholders * @brief ISO C++ 0x entities sub namespace for functional. * @ingroup binders @@ -845,6 +849,7 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) */ namespace placeholders { + _GLIBCXX_BEGIN_NAMESPACE_VERSION extern const _Placeholder<1> _1; extern const _Placeholder<2> _2; extern const _Placeholder<3> _3; @@ -874,8 +879,11 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) extern const _Placeholder<27> _27; extern const _Placeholder<28> _28; extern const _Placeholder<29> _29; + _GLIBCXX_END_NAMESPACE_VERSION } + _GLIBCXX_BEGIN_NAMESPACE_VERSION + /** * Partial specialization of is_placeholder that provides the placeholder * number for the placeholder objects defined by libstdc++. @@ -2242,7 +2250,8 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) swap(function<_Res(_Args...)>& __x, function<_Res(_Args...)>& __y) { __x.swap(__y); } -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 7b22b783867..f268d4ab06a 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -45,7 +45,9 @@ #include <atomic> #include <bits/functexcept.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup futures Futures @@ -1375,7 +1377,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // && _GLIBCXX_ATOMIC_BUILTINS_4 // @} group futures -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/iomanip b/libstdc++-v3/include/std/iomanip index 8fc2e72fd7a..91f90e5cb62 100644 --- a/libstdc++-v3/include/std/iomanip +++ b/libstdc++-v3/include/std/iomanip @@ -45,7 +45,9 @@ #include <locale> #endif -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.6.3] standard manipulators // Also see DR 183. @@ -344,6 +346,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif #endif -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif /* _GLIBCXX_IOMANIP */ diff --git a/libstdc++-v3/include/std/iosfwd b/libstdc++-v3/include/std/iosfwd index 4cbd8359b2a..8906a1d34b5 100644 --- a/libstdc++-v3/include/std/iosfwd +++ b/libstdc++-v3/include/std/iosfwd @@ -41,7 +41,9 @@ #include <bits/stringfwd.h> // For string forward declarations. #include <bits/postypes.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup io I/O @@ -204,6 +206,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #endif /** @} */ -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif /* _GLIBCXX_IOSFWD */ diff --git a/libstdc++-v3/include/std/iostream b/libstdc++-v3/include/std/iostream index 6a991caee00..7c71ba49358 100644 --- a/libstdc++-v3/include/std/iostream +++ b/libstdc++-v3/include/std/iostream @@ -40,7 +40,9 @@ #include <ostream> #include <istream> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @name Standard Stream Objects @@ -72,6 +74,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // For construction of filebuffers for cout, cin, cerr, clog et. al. static ios_base::Init __ioinit; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif /* _GLIBCXX_IOSTREAM */ diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 7b6d1520bf2..ded483349b1 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -40,7 +40,9 @@ #include <ios> #include <ostream> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.6.1.1] Template class basic_istream /** @@ -848,7 +850,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return (__is >> __x); } #endif // __GXX_EXPERIMENTAL_CXX0X__ -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/istream.tcc> diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits index 77190060bb7..9a311973c4a 100644 --- a/libstdc++-v3/include/std/limits +++ b/libstdc++-v3/include/std/limits @@ -145,7 +145,9 @@ #define __glibcxx_max_digits10(T) \ (2 + (T) * 643L / 2136) -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @brief Describes the rounding style for floating-point types. @@ -1617,7 +1619,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #undef __glibcxx_long_double_traps #undef __glibcxx_long_double_tinyness_before -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #undef __glibcxx_signed #undef __glibcxx_min diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index e8f64a44645..36f894efebb 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -48,7 +48,9 @@ #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup mutexes Mutexes @@ -818,7 +820,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } // @} group mutexes -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index b25bdb0f5bc..3004d4b69c8 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -40,7 +40,9 @@ #include <ios> #include <bits/ostream_insert.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.6.2.1] Template class basic_ostream /** @@ -580,7 +582,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return (__os << __x); } #endif // __GXX_EXPERIMENTAL_CXX0X__ -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/ostream.tcc> diff --git a/libstdc++-v3/include/std/ratio b/libstdc++-v3/include/std/ratio index 2eefdb705da..69c0b6e14bb 100644 --- a/libstdc++-v3/include/std/ratio +++ b/libstdc++-v3/include/std/ratio @@ -40,7 +40,9 @@ #ifdef _GLIBCXX_USE_C99_STDINT_TR1 -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup ratio Rational Arithmetic @@ -339,7 +341,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef ratio< 1000000000000000000, 1> exa; // @} group ratio -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif //_GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/sstream b/libstdc++-v3/include/std/sstream index c30a5b74b16..6dd0a3d8f56 100644 --- a/libstdc++-v3/include/std/sstream +++ b/libstdc++-v3/include/std/sstream @@ -39,7 +39,9 @@ #include <istream> #include <ostream> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // [27.7.1] template class basic_stringbuf /** @@ -567,7 +569,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { _M_stringbuf.str(__s); } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/sstream.tcc> diff --git a/libstdc++-v3/include/std/stdexcept b/libstdc++-v3/include/std/stdexcept index 62c5578619d..de023d12bb8 100644 --- a/libstdc++-v3/include/std/stdexcept +++ b/libstdc++-v3/include/std/stdexcept @@ -39,7 +39,9 @@ #include <exception> #include <string> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @addtogroup exceptions @@ -146,6 +148,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // @} group exceptions -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif /* _GLIBCXX_STDEXCEPT */ diff --git a/libstdc++-v3/include/std/streambuf b/libstdc++-v3/include/std/streambuf index 9b05e04af21..51d89ce9a89 100644 --- a/libstdc++-v3/include/std/streambuf +++ b/libstdc++-v3/include/std/streambuf @@ -43,7 +43,9 @@ #include <bits/cpp_type_traits.h> #include <ext/type_traits.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT, typename _Traits> streamsize @@ -793,7 +795,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) basic_streambuf<wchar_t>* __sbout, bool& __ineof); #endif -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/streambuf.tcc> diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error index 73aaa79dc7b..187c03f01d1 100644 --- a/libstdc++-v3/include/std/system_error +++ b/libstdc++-v3/include/std/system_error @@ -40,7 +40,9 @@ #include <iosfwd> #include <stdexcept> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION class error_code; class error_condition; @@ -341,13 +343,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) code() const throw() { return _M_code; } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #ifndef _GLIBCXX_COMPATIBILITY_CXX0X #include <bits/functional_hash.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // DR 1182. /// std::hash specialization for error_code. @@ -363,7 +368,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // _GLIBCXX_COMPATIBILITY_CXX0X diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread index 8a626feb73f..de58e814100 100644 --- a/libstdc++-v3/include/std/thread +++ b/libstdc++-v3/include/std/thread @@ -1,6 +1,6 @@ // <thread> -*- 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 @@ -46,7 +46,9 @@ #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup threads Threads @@ -236,12 +238,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std) return __out << __id._M_thread; } +_GLIBCXX_END_NAMESPACE_VERSION + /** @namespace std::this_thread * @brief ISO C++ 0x entities sub namespace for thread. * 30.2.2 Namespace this_thread. */ namespace this_thread { + _GLIBCXX_BEGIN_NAMESPACE_VERSION + /// get_id inline thread::id get_id() { return thread::id(__gthread_self()); } @@ -280,10 +286,13 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ::nanosleep(&__ts, 0); } #endif + + _GLIBCXX_END_NAMESPACE_VERSION } // @} group threads -_GLIBCXX_END_NAMESPACE + +} // namespace #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 87dbcb78df6..69513283f93 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -37,7 +37,9 @@ #include <utility> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION // Adds a const reference to a non-reference type. template<typename _Tp> @@ -797,7 +799,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) const _Index_tuple<_Indexes...>&) { return _Tp(std::forward<_Args>(get<_Indexes>(__tuple))...); } -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index 8f5b5c993e2..f5d867b6bfb 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -37,7 +37,9 @@ #include <bits/c++config.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @addtogroup metaprogramming @@ -1181,7 +1183,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) #undef _DEFINE_SPEC // @} group metaprogramming -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/typeindex b/libstdc++-v3/include/std/typeindex index d40306421d4..79b3eadf7a1 100644 --- a/libstdc++-v3/include/std/typeindex +++ b/libstdc++-v3/include/std/typeindex @@ -37,7 +37,9 @@ #include <typeinfo> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** @brief The class type_index provides a simple wrapper for type_info @@ -99,7 +101,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { return __ti.hash_code(); } }; -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif // __GXX_EXPERIMENTAL_CXX0X__ diff --git a/libstdc++-v3/include/std/utility b/libstdc++-v3/include/std/utility index e54a5868c90..245c41fa75d 100644 --- a/libstdc++-v3/include/std/utility +++ b/libstdc++-v3/include/std/utility @@ -74,7 +74,9 @@ #include <bits/move.h> #include <initializer_list> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION template<class _Tp> class tuple_size; @@ -136,7 +138,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) get(const std::pair<_Tp1, _Tp2>& __in) { return __pair_get<_Int>::__const_get(__in); } -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index 40e78e76914..9c18e050310 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -41,7 +41,9 @@ #include <debug/debug.h> #include <initializer_list> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION template<class _Clos, typename _Tp> class _Expr; @@ -81,12 +83,15 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<class _Tp> class mask_array; // masked array template<class _Tp> class indirect_array; // indirected array -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/valarray_array.h> #include <bits/valarray_before.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @defgroup numeric_arrays Numeric Arrays @@ -556,7 +561,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // @} group numeric_arrays -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #include <bits/valarray_after.h> #include <bits/slice_array.h> @@ -565,7 +571,9 @@ _GLIBCXX_END_NAMESPACE #include <bits/mask_array.h> #include <bits/indirect_array.h> -_GLIBCXX_BEGIN_NAMESPACE(std) +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION /** * @addtogroup numeric_arrays @@ -1151,6 +1159,7 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) // @} group numeric_arrays -_GLIBCXX_END_NAMESPACE +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace #endif /* _GLIBCXX_VALARRAY */ |