diff options
Diffstat (limited to 'libstdc++-v3/include/tr1')
28 files changed, 109 insertions, 145 deletions
diff --git a/libstdc++-v3/include/tr1/array b/libstdc++-v3/include/tr1/array index 606d019ade3..04c43411941 100644 --- a/libstdc++-v3/include/tr1/array +++ b/libstdc++-v3/include/tr1/array @@ -35,10 +35,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /** * @brief A standard container for storing a fixed size sequence of elements. * @@ -243,9 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline const _Tp& get(const array<_Tp, _Nm>& __arr) { return __arr[_Int]; } +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_ARRAY diff --git a/libstdc++-v3/include/tr1/bessel_function.tcc b/libstdc++-v3/include/tr1/bessel_function.tcc index 7ba4c8a7f0d..7ac733d73b8 100644 --- a/libstdc++-v3/include/tr1/bessel_function.tcc +++ b/libstdc++-v3/include/tr1/bessel_function.tcc @@ -50,6 +50,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -64,8 +66,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Compute the gamma functions required by the Temme series * expansions of @f$ N_\nu(x) @f$ and @f$ K_\nu(x) @f$. @@ -626,13 +626,13 @@ namespace tr1 return __n_n; } } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_BESSEL_FUNCTION_TCC diff --git a/libstdc++-v3/include/tr1/beta_function.tcc b/libstdc++-v3/include/tr1/beta_function.tcc index 2770eef3cd3..7463356906f 100644 --- a/libstdc++-v3/include/tr1/beta_function.tcc +++ b/libstdc++-v3/include/tr1/beta_function.tcc @@ -48,6 +48,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -62,8 +64,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Return the beta function: \f$B(x,y)\f$. * @@ -195,13 +195,13 @@ namespace tr1 else return __beta_lgamma(__x, __y); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_BETA_FUNCTION_TCC diff --git a/libstdc++-v3/include/tr1/cmath b/libstdc++-v3/include/tr1/cmath index b24e8c2a7d3..720452e4f5a 100644 --- a/libstdc++-v3/include/tr1/cmath +++ b/libstdc++-v3/include/tr1/cmath @@ -145,10 +145,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ #if _GLIBCXX_USE_C99_MATH_TR1 // Using declarations to bring names from libc's <math.h> into std::tr1. @@ -1059,16 +1059,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // @} -#endif -_GLIBCXX_END_NAMESPACE_VERSION -} -} - -namespace std _GLIBCXX_VISIBILITY(default) -{ -namespace tr1 -{ -_GLIBCXX_BEGIN_NAMESPACE_VERSION +#endif /* _GLIBCXX_USE_C99_MATH_TR1 */ // DR 550. What should the return type of pow(float,int) be? // NB: C++11 and TR1 != C++03. @@ -1135,20 +1126,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif // C++11 - - -_GLIBCXX_END_NAMESPACE_VERSION -} -} - #if _GLIBCXX_USE_STD_SPEC_FUNCS -namespace std _GLIBCXX_VISIBILITY(default) -{ -namespace tr1 -{ -_GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @defgroup tr1_math_spec_func Mathematical Special Functions * @ingroup numerics @@ -1250,12 +1229,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using std::sph_neumann; /* @} */ // tr1_math_spec_func -_GLIBCXX_END_NAMESPACE_VERSION -} -} #else // ! _GLIBCXX_USE_STD_SPEC_FUNCS +} // namespace tr1 + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std + #include <bits/stl_algobase.h> #include <limits> #include <tr1/type_traits> @@ -1274,10 +1255,10 @@ _GLIBCXX_END_NAMESPACE_VERSION namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /** * @defgroup tr1_math_spec_func Mathematical Special Functions * @ingroup numerics @@ -1680,9 +1661,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } /* @} */ // tr1_math_spec_func -_GLIBCXX_END_NAMESPACE_VERSION -} -} #endif // _GLIBCXX_USE_STD_SPEC_FUNCS +} // namespace tr1 + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std + #endif // _GLIBCXX_TR1_CMATH diff --git a/libstdc++-v3/include/tr1/complex b/libstdc++-v3/include/tr1/complex index 10dce9d1bb4..2e7d05cf227 100644 --- a/libstdc++-v3/include/tr1/complex +++ b/libstdc++-v3/include/tr1/complex @@ -35,10 +35,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /** * @addtogroup complex_numbers * @{ @@ -412,9 +412,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return std::pow(__x, __y); } // @} group complex_numbers +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_COMPLEX diff --git a/libstdc++-v3/include/tr1/ell_integral.tcc b/libstdc++-v3/include/tr1/ell_integral.tcc index 01f9313a256..4bd22e5eebc 100644 --- a/libstdc++-v3/include/tr1/ell_integral.tcc +++ b/libstdc++-v3/include/tr1/ell_integral.tcc @@ -44,6 +44,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -56,8 +58,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Return the Carlson elliptic function @f$ R_F(x,y,z) @f$ * of the first kind. @@ -745,12 +745,12 @@ namespace tr1 return __Pi + _Tp(2) * __n * __comp_ellint_3(__k, __nu); } } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_ELL_INTEGRAL_TCC diff --git a/libstdc++-v3/include/tr1/exp_integral.tcc b/libstdc++-v3/include/tr1/exp_integral.tcc index 8e6f55178e7..663b2ce2f73 100644 --- a/libstdc++-v3/include/tr1/exp_integral.tcc +++ b/libstdc++-v3/include/tr1/exp_integral.tcc @@ -49,6 +49,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -61,8 +63,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _Tp> _Tp __expint_E1(_Tp); /** @@ -522,12 +522,12 @@ namespace tr1 else return __expint_Ei(__x); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_EXP_INTEGRAL_TCC diff --git a/libstdc++-v3/include/tr1/functional b/libstdc++-v3/include/tr1/functional index 256f94d8a5f..cb40e90e255 100644 --- a/libstdc++-v3/include/tr1/functional +++ b/libstdc++-v3/include/tr1/functional @@ -48,18 +48,15 @@ namespace std _GLIBCXX_VISIBILITY(default) { -#if __cplusplus >= 201103L _GLIBCXX_BEGIN_NAMESPACE_VERSION +#if __cplusplus >= 201103L template<int> struct _Placeholder; template<typename> class _Bind; template<typename, typename> class _Bind_result; -_GLIBCXX_END_NAMESPACE_VERSION #endif namespace tr1 { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _MemberPointer> class _Mem_fn; template<typename _Tp, typename _Class> @@ -855,14 +852,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// The type of placeholder objects defined by libstdc++. template<int _Num> struct _Placeholder { }; -_GLIBCXX_END_NAMESPACE_VERSION - /** @namespace std::tr1::placeholders * @brief Sub-namespace for tr1/functional. */ namespace placeholders { - _GLIBCXX_BEGIN_NAMESPACE_VERSION /* Define a large number of placeholders. There is no way to * simplify this with variadic templates, because we're introducing * unique names for each. @@ -899,10 +893,8 @@ _GLIBCXX_END_NAMESPACE_VERSION _Placeholder<28> _28; _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++. @@ -2247,12 +2239,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline void swap(function<_Signature>& __x, function<_Signature>& __y) { __x.swap(__y); } - -_GLIBCXX_END_NAMESPACE_VERSION } #if __cplusplus >= 201103L -_GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename> struct is_placeholder; @@ -2301,8 +2290,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Signature>> : true_type { }; +#endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION -#endif } #endif // _GLIBCXX_TR1_FUNCTIONAL diff --git a/libstdc++-v3/include/tr1/functional_hash.h b/libstdc++-v3/include/tr1/functional_hash.h index acc766ddd53..f8cff25257f 100644 --- a/libstdc++-v3/include/tr1/functional_hash.h +++ b/libstdc++-v3/include/tr1/functional_hash.h @@ -34,10 +34,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /// Class template hash. // Declaration of default hash functor std::tr1::hash. The types for // which std::tr1::hash<T> is well-defined is in clause 6.3.3. of the PDTR. @@ -192,9 +192,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_PURE size_t hash<const wstring&>::operator()(const wstring&) const; #endif +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_FUNCTIONAL_HASH_H diff --git a/libstdc++-v3/include/tr1/gamma.tcc b/libstdc++-v3/include/tr1/gamma.tcc index dbbca1e9e80..7c4a664e5c9 100644 --- a/libstdc++-v3/include/tr1/gamma.tcc +++ b/libstdc++-v3/include/tr1/gamma.tcc @@ -50,6 +50,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -62,8 +64,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief This returns Bernoulli numbers from a table or by summation * for larger values. @@ -466,13 +466,13 @@ namespace tr1 return __result; } } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } // namespace std #endif // _GLIBCXX_TR1_GAMMA_TCC diff --git a/libstdc++-v3/include/tr1/hashtable.h b/libstdc++-v3/include/tr1/hashtable.h index 8dc7a41ad5e..6e798cfd1dd 100644 --- a/libstdc++-v3/include/tr1/hashtable.h +++ b/libstdc++-v3/include/tr1/hashtable.h @@ -37,10 +37,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ // Class template _Hashtable, class definition. // Meaning of class template _Hashtable's template parameters @@ -1173,9 +1173,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __throw_exception_again; } } +} // namespace tr1 _GLIBCXX_END_NAMESPACE_VERSION -} // namespace tr1 } // namespace std #endif // _GLIBCXX_TR1_HASHTABLE_H diff --git a/libstdc++-v3/include/tr1/hashtable_policy.h b/libstdc++-v3/include/tr1/hashtable_policy.h index f44d0cf9a73..9a75443ccb6 100644 --- a/libstdc++-v3/include/tr1/hashtable_policy.h +++ b/libstdc++-v3/include/tr1/hashtable_policy.h @@ -30,12 +30,12 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace tr1 { namespace __detail { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - // Helper function: return distance(first, last) for forward // iterators, or 0 for input iterators. template<class _Iterator> @@ -772,7 +772,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _H1 _M_h1; _H2 _M_h2; }; -_GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail } + +_GLIBCXX_END_NAMESPACE_VERSION } diff --git a/libstdc++-v3/include/tr1/hypergeometric.tcc b/libstdc++-v3/include/tr1/hypergeometric.tcc index 49af5f98d96..dc9f176e27a 100644 --- a/libstdc++-v3/include/tr1/hypergeometric.tcc +++ b/libstdc++-v3/include/tr1/hypergeometric.tcc @@ -43,6 +43,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -57,8 +59,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief This routine returns the confluent hypergeometric function * by series expansion. @@ -773,13 +773,13 @@ namespace tr1 else return __hyperg_luke(__a, __b, __c, __x); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_HYPERGEOMETRIC_TCC diff --git a/libstdc++-v3/include/tr1/legendre_function.tcc b/libstdc++-v3/include/tr1/legendre_function.tcc index ea2a511d977..16fee54e9c4 100644 --- a/libstdc++-v3/include/tr1/legendre_function.tcc +++ b/libstdc++-v3/include/tr1/legendre_function.tcc @@ -48,6 +48,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -62,8 +64,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Return the Legendre polynomial by recursion on order * @f$ l @f$. @@ -301,13 +301,13 @@ namespace tr1 } } } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_LEGENDRE_FUNCTION_TCC diff --git a/libstdc++-v3/include/tr1/modified_bessel_func.tcc b/libstdc++-v3/include/tr1/modified_bessel_func.tcc index d21e3c7de66..79d7d7578fa 100644 --- a/libstdc++-v3/include/tr1/modified_bessel_func.tcc +++ b/libstdc++-v3/include/tr1/modified_bessel_func.tcc @@ -50,6 +50,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -62,8 +64,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Compute the modified Bessel functions @f$ I_\nu(x) @f$ and * @f$ K_\nu(x) @f$ and their first derivatives @@ -430,12 +430,12 @@ namespace tr1 return; } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_MODIFIED_BESSEL_FUNC_TCC diff --git a/libstdc++-v3/include/tr1/poly_hermite.tcc b/libstdc++-v3/include/tr1/poly_hermite.tcc index 80ea2187e4f..8136284310c 100644 --- a/libstdc++-v3/include/tr1/poly_hermite.tcc +++ b/libstdc++-v3/include/tr1/poly_hermite.tcc @@ -41,6 +41,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -53,8 +55,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief This routine returns the Hermite polynomial * of order n: \f$ H_n(x) \f$ by recursion on n. @@ -120,12 +120,12 @@ namespace tr1 else return __poly_hermite_recursion(__n, __x); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_POLY_HERMITE_TCC diff --git a/libstdc++-v3/include/tr1/poly_laguerre.tcc b/libstdc++-v3/include/tr1/poly_laguerre.tcc index 0c33c032040..420b1f34db4 100644 --- a/libstdc++-v3/include/tr1/poly_laguerre.tcc +++ b/libstdc++-v3/include/tr1/poly_laguerre.tcc @@ -43,6 +43,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -57,8 +59,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief This routine returns the associated Laguerre polynomial * of order @f$ n @f$, degree @f$ \alpha @f$ for large n. @@ -317,13 +317,13 @@ namespace tr1 inline _Tp __laguerre(unsigned int __n, _Tp __x) { return __poly_laguerre<unsigned int, _Tp>(__n, 0, __x); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_POLY_LAGUERRE_TCC diff --git a/libstdc++-v3/include/tr1/random.h b/libstdc++-v3/include/tr1/random.h index 9fe7fae900f..79a5b8f8cd4 100644 --- a/libstdc++-v3/include/tr1/random.h +++ b/libstdc++-v3/include/tr1/random.h @@ -35,6 +35,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace tr1 { // [5.1] Random number generation @@ -50,8 +52,6 @@ namespace tr1 */ namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<typename _UIntType, int __w, bool = __w < std::numeric_limits<_UIntType>::digits> struct _Shift @@ -212,12 +212,8 @@ namespace tr1 private: _Engine* _M_g; }; - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail -_GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * Produces random numbers on a given distribution function using a * non-uniform random number generation engine. @@ -2410,8 +2406,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /* @} */ // group tr1_random_distributions_continuous /* @} */ // group tr1_random_distributions /* @} */ // group tr1_random -_GLIBCXX_END_NAMESPACE_VERSION } + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_RANDOM_H diff --git a/libstdc++-v3/include/tr1/random.tcc b/libstdc++-v3/include/tr1/random.tcc index 265bd0bc2db..25f444a1644 100644 --- a/libstdc++-v3/include/tr1/random.tcc +++ b/libstdc++-v3/include/tr1/random.tcc @@ -33,6 +33,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace tr1 { /* @@ -40,8 +42,6 @@ namespace tr1 */ namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - // General case for x = (ax + c) mod m -- use Schrage's algorithm to avoid // integer overflow. // @@ -92,11 +92,8 @@ namespace tr1 __calc(_Tp __x) { return __a * __x + __c; } }; - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail -_GLIBCXX_BEGIN_NAMESPACE_VERSION - template<class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m> const _UIntType linear_congruential<_UIntType, __a, __c, __m>::multiplier; @@ -1713,9 +1710,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __os.precision(__precision); return __os; } +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif diff --git a/libstdc++-v3/include/tr1/regex b/libstdc++-v3/include/tr1/regex index bfb5ef770d4..6cb8c154e86 100644 --- a/libstdc++-v3/include/tr1/regex +++ b/libstdc++-v3/include/tr1/regex @@ -45,6 +45,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + namespace tr1 { /** @@ -58,8 +60,6 @@ namespace tr1 */ namespace regex_constants { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @name 5.1 Regular Expression Syntax Options */ @@ -397,11 +397,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static const error_type error_stack(_S_error_stack); //@} -_GLIBCXX_END_NAMESPACE_VERSION } -_GLIBCXX_BEGIN_NAMESPACE_VERSION - // [7.8] Class regex_error /** * @brief A regular expression exception class. @@ -2722,9 +2719,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #endif //@} +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_REGEX diff --git a/libstdc++-v3/include/tr1/riemann_zeta.tcc b/libstdc++-v3/include/tr1/riemann_zeta.tcc index b4992f265ae..130cef63c45 100644 --- a/libstdc++-v3/include/tr1/riemann_zeta.tcc +++ b/libstdc++-v3/include/tr1/riemann_zeta.tcc @@ -46,6 +46,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS # define _GLIBCXX_MATH_NS ::std #elif defined(_GLIBCXX_TR1_CMATH) @@ -60,8 +62,6 @@ namespace tr1 // Implementation-space details. namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /** * @brief Compute the Riemann zeta function @f$ \zeta(s) @f$ * by summation for s > 1. @@ -431,13 +431,13 @@ namespace tr1 inline _Tp __hurwitz_zeta(_Tp __a, _Tp __s) { return __hurwitz_zeta_glob(__a, __s); } - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #undef _GLIBCXX_MATH_NS #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_RIEMANN_ZETA_TCC diff --git a/libstdc++-v3/include/tr1/shared_ptr.h b/libstdc++-v3/include/tr1/shared_ptr.h index f702cd68972..95ac9775b9b 100644 --- a/libstdc++-v3/include/tr1/shared_ptr.h +++ b/libstdc++-v3/include/tr1/shared_ptr.h @@ -51,10 +51,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /** * @brief Exception possibly thrown by @c shared_ptr. * @ingroup exceptions @@ -1162,9 +1162,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION mutable weak_ptr<_Tp> _M_weak_this; }; +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _TR1_SHARED_PTR_H diff --git a/libstdc++-v3/include/tr1/special_function_util.h b/libstdc++-v3/include/tr1/special_function_util.h index 9d40a16ca6c..c4e9c476150 100644 --- a/libstdc++-v3/include/tr1/special_function_util.h +++ b/libstdc++-v3/include/tr1/special_function_util.h @@ -38,6 +38,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + #if _GLIBCXX_USE_STD_SPEC_FUNCS #elif defined(_GLIBCXX_TR1_CMATH) namespace tr1 @@ -47,8 +49,6 @@ namespace tr1 #endif namespace __detail { - _GLIBCXX_BEGIN_NAMESPACE_VERSION - /// A class to encapsulate type dependent floating point /// constants. Not everything will be able to be expressed as /// type logic. @@ -130,12 +130,12 @@ namespace tr1 { return __builtin_isnanl(__x); } #endif - - _GLIBCXX_END_NAMESPACE_VERSION } // namespace __detail #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) } // namespace tr1 #endif + +_GLIBCXX_END_NAMESPACE_VERSION } #endif // _GLIBCXX_TR1_SPECIAL_FUNCTION_UTIL_H diff --git a/libstdc++-v3/include/tr1/tuple b/libstdc++-v3/include/tr1/tuple index fe53a8b99b0..997542d241b 100644 --- a/libstdc++-v3/include/tr1/tuple +++ b/libstdc++-v3/include/tr1/tuple @@ -38,10 +38,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ // Adds a const reference to a non-reference type. template<typename _Tp> struct __add_c_ref @@ -418,9 +418,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _Swallow_assign ignore; }; // anonymous namespace +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_TUPLE diff --git a/libstdc++-v3/include/tr1/type_traits b/libstdc++-v3/include/tr1/type_traits index abdb83b48ec..83dd7b7dcf2 100644 --- a/libstdc++-v3/include/tr1/type_traits +++ b/libstdc++-v3/include/tr1/type_traits @@ -35,10 +35,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ /** * @addtogroup metaprogramming * @{ @@ -679,9 +679,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #undef _DEFINE_SPEC /// @} group metaprogramming +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_TYPE_TRAITS diff --git a/libstdc++-v3/include/tr1/unordered_map.h b/libstdc++-v3/include/tr1/unordered_map.h index 34776aeea58..a27654a45d2 100644 --- a/libstdc++-v3/include/tr1/unordered_map.h +++ b/libstdc++-v3/include/tr1/unordered_map.h @@ -29,10 +29,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ // NB: When we get typedef templates these class definitions // will be unnecessary. template<class _Key, class _Tp, @@ -272,7 +272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x, unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y) { __x.swap(__y); } +} _GLIBCXX_END_NAMESPACE_VERSION } -} diff --git a/libstdc++-v3/include/tr1/unordered_set.h b/libstdc++-v3/include/tr1/unordered_set.h index f9d04901cc5..df24ca6b299 100644 --- a/libstdc++-v3/include/tr1/unordered_set.h +++ b/libstdc++-v3/include/tr1/unordered_set.h @@ -29,10 +29,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ // NB: When we get typedef templates these class definitions // will be unnecessary. template<class _Value, @@ -261,7 +261,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x, unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y) { __x.swap(__y); } +} _GLIBCXX_END_NAMESPACE_VERSION } -} diff --git a/libstdc++-v3/include/tr1/utility b/libstdc++-v3/include/tr1/utility index 91076d9882c..f114160005f 100644 --- a/libstdc++-v3/include/tr1/utility +++ b/libstdc++-v3/include/tr1/utility @@ -37,10 +37,10 @@ namespace std _GLIBCXX_VISIBILITY(default) { -namespace tr1 -{ _GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace tr1 +{ template<class _Tp> class tuple_size; @@ -100,9 +100,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline const typename tuple_element<_Int, std::pair<_Tp1, _Tp2> >::type& get(const std::pair<_Tp1, _Tp2>& __in) { return __pair_get<_Int>::__const_get(__in); } +} _GLIBCXX_END_NAMESPACE_VERSION } -} #endif // _GLIBCXX_TR1_UTILITY |