Commit 4a15d842 by François Dumont

re PR libstdc++/81064 (Inline namespace regression)

2017-07-23  François Dumont  <fdumont@gcc.gnu.org>

	PR libstdc++/81064
	* include/bits/algorithmfwd.h: Reorganize versioned namespace.
	* include/bits/basic_string.h: Likewise.
	* include/bits/c++config: Likewise.
	* include/bits/deque.tcc: Likewise.
	* include/bits/forward_list.h: Likewise.
	* include/bits/forward_list.tcc: Likewise.
	* include/bits/hashtable_policy.h: Likewise.
	* include/bits/list.tcc: Likewise.
	* include/bits/move.h: Likewise.
	* include/bits/quoted_string.h: Likewise.
	* include/bits/random.h: Likewise.
	* include/bits/random.tcc: Likewise.
	* include/bits/regex.h: Likewise.
	* include/bits/regex.tcc: Likewise.
	* include/bits/regex_automaton.h: Likewise.
	* include/bits/regex_automaton.tcc: Likewise.
	* include/bits/regex_compiler.h: Likewise.
	* include/bits/regex_compiler.tcc: Likewise.
	* include/bits/regex_constants.h: Likewise.
	* include/bits/regex_error.h: Likewise.
	* include/bits/regex_executor.h: Likewise.
	* include/bits/regex_executor.tcc: Likewise.
	* include/bits/regex_scanner.h: Likewise.
	* include/bits/regex_scanner.tcc: Likewise.
	* include/bits/specfun.h: Likewise.
	* include/bits/stl_algo.h: Likewise.
	* include/bits/stl_algobase.h: Likewise.
	* include/bits/stl_bvector.h: Likewise.
	* include/bits/stl_deque.h: Likewise.
	* include/bits/stl_iterator.h: Likewise.
	* include/bits/stl_iterator_base_funcs.h: Likewise.
	* include/bits/stl_list.h: Likewise.
	* include/bits/stl_map.h: Likewise.
	* include/bits/stl_multimap.h: Likewise.
	* include/bits/stl_multiset.h: Likewise.
	* include/bits/stl_relops.h: Likewise.
	* include/bits/stl_set.h: Likewise.
	* include/bits/stl_vector.h: Likewise.
	* include/bits/uniform_int_dist.h: Likewise.
	* include/bits/unordered_map.h: Likewise.
	* include/bits/unordered_set.h: Likewise.
	* include/bits/vector.tcc: Likewise.
	* include/c_global/cmath: Likewise.
	* include/c_std/cmath: Likewise.
	* include/decimal/decimal: Likewise.
	* include/decimal/decimal.h: Likewise.
	* include/experimental/algorithm: Likewise.
	* include/experimental/any: Likewise.
	* include/experimental/array: Likewise.
	* include/experimental/bits/erase_if.h: Likewise.
	* include/experimental/bits/fs_dir.h: Likewise.
	* include/experimental/bits/fs_fwd.h: Likewise.
	* include/experimental/bits/fs_ops.h: Likewise.
	* include/experimental/bits/fs_path.h: Likewise.
	* include/experimental/bits/lfts_config.h: Likewise.
	* include/experimental/bits/shared_ptr.h: Likewise.
	* include/experimental/bits/string_view.tcc: Likewise.
	* include/experimental/chrono: Likewise.
	* include/experimental/deque: Likewise.
	* include/experimental/filesystem: Likewise.
	* include/experimental/forward_list: Likewise.
	* include/experimental/functional: Likewise.
	* include/experimental/iterator: Likewise.
	* include/experimental/list: Likewise.
	* include/experimental/map: Likewise.
	* include/experimental/memory: Likewise.
	* include/experimental/memory_resource: Likewise.
	* include/experimental/numeric: Likewise.
	* include/experimental/optional: Likewise.
	* include/experimental/propagate_const: Likewise.
	* include/experimental/random: Likewise.
	* include/experimental/ratio: Likewise.
	* include/experimental/regex: Likewise.
	* include/experimental/set: Likewise.
	* include/experimental/source_location: Likewise.
	* include/experimental/string: Likewise.
	* include/experimental/string_view: Likewise.
	* include/experimental/system_error: Likewise.
	* include/experimental/tuple: Likewise.
	* include/experimental/type_traits: Likewise.
	* include/experimental/unordered_map: Likewise.
	* include/experimental/unordered_set: Likewise.
	* include/experimental/utility: Likewise.
	* include/experimental/vector: Likewise.
	* include/ext/bitmap_allocator.h: Likewise.
	* include/ext/codecvt_specializations.h: Likewise.
	* include/ext/rope: Likewise.
	* include/ext/typelist.h: Likewise.
	* include/std/chrono: Likewise.
	* include/std/complex: Likewise.
	* include/std/functional: Likewise.
	* include/std/numeric: Likewise.
	* include/std/string_view: Likewise.
	* include/std/thread: Likewise.
	* include/std/variant: Likewise.
	* include/tr1/array: Likewise.
	* include/tr1/bessel_function.tcc: Likewise.
	* include/tr1/beta_function.tcc: Likewise.
	* include/tr1/cmath: Likewise.
	* include/tr1/complex: Likewise.
	* include/tr1/ell_integral.tcc: Likewise.
	* include/tr1/exp_integral.tcc: Likewise.
	* include/tr1/functional: Likewise.
	* include/tr1/functional_hash.h: Likewise.
	* include/tr1/gamma.tcc: Likewise.
	* include/tr1/hashtable.h: Likewise.
	* include/tr1/hashtable_policy.h: Likewise.
	* include/tr1/hypergeometric.tcc: Likewise.
	* include/tr1/legendre_function.tcc: Likewise.
	* include/tr1/modified_bessel_func.tcc: Likewise.
	* include/tr1/poly_hermite.tcc: Likewise.
	* include/tr1/poly_laguerre.tcc: Likewise.
	* include/tr1/random.h: Likewise.
	* include/tr1/random.tcc: Likewise.
	* include/tr1/regex: Likewise.
	* include/tr1/riemann_zeta.tcc: Likewise.
	* include/tr1/shared_ptr.h: Likewise.
	* include/tr1/special_function_util.h: Likewise.
	* include/tr1/tuple: Likewise.
	* include/tr1/type_traits: Likewise.
	* include/tr1/unordered_map.h: Likewise.
	* include/tr1/unordered_set.h: Likewise.
	* include/tr1/utility: Likewise.
	* include/tr2/bool_set: Likewise.
	* include/tr2/bool_set.tcc: Likewise.
	* include/tr2/dynamic_bitset: Likewise.
	* include/tr2/dynamic_bitset.tcc: Likewise.
	* include/tr2/ratio: Likewise.
	* include/tr2/type_traits: Likewise.
	* src/c++11/chrono.cc: Likewise.
	* src/c++11/compatibility-c++0x.cc: Likewise.
	* src/c++11/compatibility-chrono.cc: Likewise.
	* src/c++11/cxx11-shim_facets.cc: Likewise.
	* src/c++11/hashtable_c++0x.cc: Likewise.
	* src/c++11/placeholders.cc: Likewise.
	* src/c++11/thread.cc: Likewise.
	* src/c++98/bitmap_allocator.cc: Likewise.
	* src/c++98/hashtable_tr1.cc: Likewise.
	* src/c++98/list.cc: Likewise.
	* src/shared/hashtable-aux.cc: Likewise.
	* testsuite/20_util/duration/literals/range.cc: Adapt line number.
	* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Likewise.
	* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise.
	* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Likewise.
	* testsuite/20_util/forward/c_neg.cc: Likewise.
	* testsuite/20_util/forward/f_neg.cc: Likewise.
	* testsuite/26_numerics/gcd/gcd_neg.cc: Likewise.
	* testsuite/26_numerics/lcm/lcm_neg.cc: Likewise.
	* testsuite/26_numerics/random/pr60037-neg.cc: Likewise.
	* python/libstdcxx/v6/printers.py: Adapt.

From-SVN: r250458
parent ab45a34c
2017-07-23 François Dumont <fdumont@gcc.gnu.org>
PR libstdc++/81064
* include/bits/algorithmfwd.h: Reorganize versioned namespace.
* include/bits/basic_string.h: Likewise.
* include/bits/c++config: Likewise.
* include/bits/deque.tcc: Likewise.
* include/bits/forward_list.h: Likewise.
* include/bits/forward_list.tcc: Likewise.
* include/bits/hashtable_policy.h: Likewise.
* include/bits/list.tcc: Likewise.
* include/bits/move.h: Likewise.
* include/bits/quoted_string.h: Likewise.
* include/bits/random.h: Likewise.
* include/bits/random.tcc: Likewise.
* include/bits/regex.h: Likewise.
* include/bits/regex.tcc: Likewise.
* include/bits/regex_automaton.h: Likewise.
* include/bits/regex_automaton.tcc: Likewise.
* include/bits/regex_compiler.h: Likewise.
* include/bits/regex_compiler.tcc: Likewise.
* include/bits/regex_constants.h: Likewise.
* include/bits/regex_error.h: Likewise.
* include/bits/regex_executor.h: Likewise.
* include/bits/regex_executor.tcc: Likewise.
* include/bits/regex_scanner.h: Likewise.
* include/bits/regex_scanner.tcc: Likewise.
* include/bits/specfun.h: Likewise.
* include/bits/stl_algo.h: Likewise.
* include/bits/stl_algobase.h: Likewise.
* include/bits/stl_bvector.h: Likewise.
* include/bits/stl_deque.h: Likewise.
* include/bits/stl_iterator.h: Likewise.
* include/bits/stl_iterator_base_funcs.h: Likewise.
* include/bits/stl_list.h: Likewise.
* include/bits/stl_map.h: Likewise.
* include/bits/stl_multimap.h: Likewise.
* include/bits/stl_multiset.h: Likewise.
* include/bits/stl_relops.h: Likewise.
* include/bits/stl_set.h: Likewise.
* include/bits/stl_vector.h: Likewise.
* include/bits/uniform_int_dist.h: Likewise.
* include/bits/unordered_map.h: Likewise.
* include/bits/unordered_set.h: Likewise.
* include/bits/vector.tcc: Likewise.
* include/c_global/cmath: Likewise.
* include/c_std/cmath: Likewise.
* include/decimal/decimal: Likewise.
* include/decimal/decimal.h: Likewise.
* include/experimental/algorithm: Likewise.
* include/experimental/any: Likewise.
* include/experimental/array: Likewise.
* include/experimental/bits/erase_if.h: Likewise.
* include/experimental/bits/fs_dir.h: Likewise.
* include/experimental/bits/fs_fwd.h: Likewise.
* include/experimental/bits/fs_ops.h: Likewise.
* include/experimental/bits/fs_path.h: Likewise.
* include/experimental/bits/lfts_config.h: Likewise.
* include/experimental/bits/shared_ptr.h: Likewise.
* include/experimental/bits/string_view.tcc: Likewise.
* include/experimental/chrono: Likewise.
* include/experimental/deque: Likewise.
* include/experimental/filesystem: Likewise.
* include/experimental/forward_list: Likewise.
* include/experimental/functional: Likewise.
* include/experimental/iterator: Likewise.
* include/experimental/list: Likewise.
* include/experimental/map: Likewise.
* include/experimental/memory: Likewise.
* include/experimental/memory_resource: Likewise.
* include/experimental/numeric: Likewise.
* include/experimental/optional: Likewise.
* include/experimental/propagate_const: Likewise.
* include/experimental/random: Likewise.
* include/experimental/ratio: Likewise.
* include/experimental/regex: Likewise.
* include/experimental/set: Likewise.
* include/experimental/source_location: Likewise.
* include/experimental/string: Likewise.
* include/experimental/string_view: Likewise.
* include/experimental/system_error: Likewise.
* include/experimental/tuple: Likewise.
* include/experimental/type_traits: Likewise.
* include/experimental/unordered_map: Likewise.
* include/experimental/unordered_set: Likewise.
* include/experimental/utility: Likewise.
* include/experimental/vector: Likewise.
* include/ext/bitmap_allocator.h: Likewise.
* include/ext/codecvt_specializations.h: Likewise.
* include/ext/rope: Likewise.
* include/ext/typelist.h: Likewise.
* include/std/chrono: Likewise.
* include/std/complex: Likewise.
* include/std/functional: Likewise.
* include/std/numeric: Likewise.
* include/std/string_view: Likewise.
* include/std/thread: Likewise.
* include/std/variant: Likewise.
* include/tr1/array: Likewise.
* include/tr1/bessel_function.tcc: Likewise.
* include/tr1/beta_function.tcc: Likewise.
* include/tr1/cmath: Likewise.
* include/tr1/complex: Likewise.
* include/tr1/ell_integral.tcc: Likewise.
* include/tr1/exp_integral.tcc: Likewise.
* include/tr1/functional: Likewise.
* include/tr1/functional_hash.h: Likewise.
* include/tr1/gamma.tcc: Likewise.
* include/tr1/hashtable.h: Likewise.
* include/tr1/hashtable_policy.h: Likewise.
* include/tr1/hypergeometric.tcc: Likewise.
* include/tr1/legendre_function.tcc: Likewise.
* include/tr1/modified_bessel_func.tcc: Likewise.
* include/tr1/poly_hermite.tcc: Likewise.
* include/tr1/poly_laguerre.tcc: Likewise.
* include/tr1/random.h: Likewise.
* include/tr1/random.tcc: Likewise.
* include/tr1/regex: Likewise.
* include/tr1/riemann_zeta.tcc: Likewise.
* include/tr1/shared_ptr.h: Likewise.
* include/tr1/special_function_util.h: Likewise.
* include/tr1/tuple: Likewise.
* include/tr1/type_traits: Likewise.
* include/tr1/unordered_map.h: Likewise.
* include/tr1/unordered_set.h: Likewise.
* include/tr1/utility: Likewise.
* include/tr2/bool_set: Likewise.
* include/tr2/bool_set.tcc: Likewise.
* include/tr2/dynamic_bitset: Likewise.
* include/tr2/dynamic_bitset.tcc: Likewise.
* include/tr2/ratio: Likewise.
* include/tr2/type_traits: Likewise.
* src/c++11/chrono.cc: Likewise.
* src/c++11/compatibility-c++0x.cc: Likewise.
* src/c++11/compatibility-chrono.cc: Likewise.
* src/c++11/cxx11-shim_facets.cc: Likewise.
* src/c++11/hashtable_c++0x.cc: Likewise.
* src/c++11/placeholders.cc: Likewise.
* src/c++11/thread.cc: Likewise.
* src/c++98/bitmap_allocator.cc: Likewise.
* src/c++98/hashtable_tr1.cc: Likewise.
* src/c++98/list.cc: Likewise.
* src/shared/hashtable-aux.cc: Likewise.
* testsuite/20_util/duration/literals/range.cc: Adapt line number.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Likewise.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Likewise.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Likewise.
* testsuite/20_util/forward/c_neg.cc: Likewise.
* testsuite/20_util/forward/f_neg.cc: Likewise.
* testsuite/26_numerics/gcd/gcd_neg.cc: Likewise.
* testsuite/26_numerics/lcm/lcm_neg.cc: Likewise.
* testsuite/26_numerics/random/pr60037-neg.cc: Likewise.
* python/libstdcxx/v6/printers.py: Adapt.
2017-07-20 Jonathan Wakely <jwakely@redhat.com> 2017-07-20 Jonathan Wakely <jwakely@redhat.com>
* config/allocator/malloc_allocator_base.h [__SANITIZE_ADDRESS__] * config/allocator/malloc_allocator_base.h [__SANITIZE_ADDRESS__]
......
...@@ -615,8 +615,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -615,8 +615,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_FIter _FIter
upper_bound(_FIter, _FIter, const _Tp&, _Compare); upper_bound(_FIter, _FIter, const _Tp&, _Compare);
_GLIBCXX_END_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_ALGO _GLIBCXX_BEGIN_NAMESPACE_ALGO
template<typename _FIter> template<typename _FIter>
...@@ -845,6 +843,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -845,6 +843,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
unique_copy(_IIter, _IIter, _OIter, _BinaryPredicate); unique_copy(_IIter, _IIter, _OIter, _BinaryPredicate);
_GLIBCXX_END_NAMESPACE_ALGO _GLIBCXX_END_NAMESPACE_ALGO
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#ifdef _GLIBCXX_PARALLEL #ifdef _GLIBCXX_PARALLEL
......
...@@ -6470,8 +6470,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -6470,8 +6470,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }; { };
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
#if __cplusplus > 201103L #if __cplusplus > 201103L
#define __cpp_lib_string_udls 201304 #define __cpp_lib_string_udls 201304
...@@ -6480,8 +6478,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -6480,8 +6478,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
{ {
inline namespace string_literals inline namespace string_literals
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_DEFAULT_ABI_TAG _GLIBCXX_DEFAULT_ABI_TAG
inline basic_string<char> inline basic_string<char>
operator""s(const char* __str, size_t __len) operator""s(const char* __str, size_t __len)
...@@ -6506,12 +6502,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -6506,12 +6502,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return basic_string<char32_t>{__str, __len}; } { return basic_string<char32_t>{__str, __len}; }
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // inline namespace string_literals } // inline namespace string_literals
} // inline namespace literals } // inline namespace literals
#endif // __cplusplus > 201103L #endif // __cplusplus > 201103L
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -267,88 +267,58 @@ namespace __gnu_cxx ...@@ -267,88 +267,58 @@ namespace __gnu_cxx
# define _GLIBCXX_DEFAULT_ABI_TAG # define _GLIBCXX_DEFAULT_ABI_TAG
#endif #endif
// Defined if inline namespaces are used for versioning. // Defined if inline namespaces are used for versioning.
#define _GLIBCXX_INLINE_VERSION #define _GLIBCXX_INLINE_VERSION
// Inline namespace for symbol versioning. // Inline namespace for symbol versioning.
#if _GLIBCXX_INLINE_VERSION #if _GLIBCXX_INLINE_VERSION
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __8 {
# define _GLIBCXX_END_NAMESPACE_VERSION }
namespace std namespace std
{ {
inline namespace __8 { } inline _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace rel_ops { inline namespace __8 { } }
namespace tr1
{
inline namespace __8 { }
namespace placeholders { inline namespace __8 { } }
namespace regex_constants { inline namespace __8 { } }
namespace __detail { inline namespace __8 { } }
}
namespace tr2
{ inline namespace __8 { } }
namespace decimal { inline namespace __8 { } }
#if __cplusplus >= 201103L
namespace chrono { inline namespace __8 { } }
namespace placeholders { inline namespace __8 { } }
namespace regex_constants { inline namespace __8 { } }
namespace this_thread { inline namespace __8 { } }
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
inline namespace literals { inline namespace literals {
inline namespace chrono_literals { inline namespace __8 { } } inline namespace chrono_literals { }
inline namespace complex_literals { inline namespace __8 { } } inline namespace complex_literals { }
inline namespace string_literals { inline namespace __8 { } } inline namespace string_literals { }
#if __cplusplus > 201402L #if __cplusplus > 201402L
inline namespace string_view_literals { inline namespace __8 { } } inline namespace string_view_literals { }
#endif // C++17 #endif // C++17
} }
#endif // C++14 #endif // C++14
#endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION
namespace __detail {
inline namespace __8 { }
#if __cplusplus > 201402L
namespace __variant { inline namespace __8 { } }
#endif
}
} }
namespace __gnu_cxx namespace __gnu_cxx
{ {
inline namespace __8 { } inline _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail { inline namespace __8 { } } _GLIBCXX_END_NAMESPACE_VERSION
} }
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __8 {
# define _GLIBCXX_END_NAMESPACE_VERSION }
#else #else
# define _GLIBCXX_BEGIN_NAMESPACE_VERSION # define _GLIBCXX_BEGIN_NAMESPACE_VERSION
# define _GLIBCXX_END_NAMESPACE_VERSION # define _GLIBCXX_END_NAMESPACE_VERSION
#endif #endif
// Inline namespaces for special modes: debug, parallel, profile. // Inline namespaces for special modes: debug, parallel, profile.
#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL) \ #if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PARALLEL) \
|| defined(_GLIBCXX_PROFILE) || defined(_GLIBCXX_PROFILE)
namespace std namespace std
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Non-inline namespace for components replaced by alternates in active mode. // Non-inline namespace for components replaced by alternates in active mode.
namespace __cxx1998 namespace __cxx1998
{ {
# if _GLIBCXX_INLINE_VERSION
inline namespace __8 { }
# endif
# if _GLIBCXX_USE_CXX11_ABI # if _GLIBCXX_USE_CXX11_ABI
inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { } inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
# endif # endif
} }
_GLIBCXX_END_NAMESPACE_VERSION
// Inline namespace for debug mode. // Inline namespace for debug mode.
# ifdef _GLIBCXX_DEBUG # ifdef _GLIBCXX_DEBUG
inline namespace __debug { } inline namespace __debug { }
...@@ -396,25 +366,23 @@ namespace std ...@@ -396,25 +366,23 @@ namespace std
#if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE) #if defined(_GLIBCXX_DEBUG) || defined(_GLIBCXX_PROFILE)
# define _GLIBCXX_STD_C __cxx1998 # define _GLIBCXX_STD_C __cxx1998
# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER \ # define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER \
namespace _GLIBCXX_STD_C { _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace _GLIBCXX_STD_C {
# define _GLIBCXX_END_NAMESPACE_CONTAINER \ # define _GLIBCXX_END_NAMESPACE_CONTAINER }
_GLIBCXX_END_NAMESPACE_VERSION }
#else #else
# define _GLIBCXX_STD_C std # define _GLIBCXX_STD_C std
# define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_VERSION # define _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
# define _GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_VERSION # define _GLIBCXX_END_NAMESPACE_CONTAINER
#endif #endif
#ifdef _GLIBCXX_PARALLEL #ifdef _GLIBCXX_PARALLEL
# define _GLIBCXX_STD_A __cxx1998 # define _GLIBCXX_STD_A __cxx1998
# define _GLIBCXX_BEGIN_NAMESPACE_ALGO \ # define _GLIBCXX_BEGIN_NAMESPACE_ALGO \
namespace _GLIBCXX_STD_A { _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace _GLIBCXX_STD_A {
# define _GLIBCXX_END_NAMESPACE_ALGO \ # define _GLIBCXX_END_NAMESPACE_ALGO }
_GLIBCXX_END_NAMESPACE_VERSION }
#else #else
# define _GLIBCXX_STD_A std # define _GLIBCXX_STD_A std
# define _GLIBCXX_BEGIN_NAMESPACE_ALGO _GLIBCXX_BEGIN_NAMESPACE_VERSION # define _GLIBCXX_BEGIN_NAMESPACE_ALGO
# define _GLIBCXX_END_NAMESPACE_ALGO _GLIBCXX_END_NAMESPACE_VERSION # define _GLIBCXX_END_NAMESPACE_ALGO
#endif #endif
// GLIBCXX_ABI Deprecated // GLIBCXX_ABI Deprecated
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
...@@ -1107,6 +1108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1107,6 +1108,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#endif #endif
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/** /**
...@@ -1440,6 +1441,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1440,6 +1441,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ __lx.swap(__ly); } { __lx.swap(__ly); }
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // _FORWARD_LIST_H #endif // _FORWARD_LIST_H
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Tp, typename _Alloc> template<typename _Tp, typename _Alloc>
...@@ -493,6 +494,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -493,6 +494,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
} }
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _FORWARD_LIST_TCC */ #endif /* _FORWARD_LIST_TCC */
......
...@@ -43,12 +43,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -43,12 +43,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typename _RehashPolicy, typename _Traits> typename _RehashPolicy, typename _Traits>
class _Hashtable; class _Hashtable;
_GLIBCXX_END_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup hashtable-detail Base and Implementation Classes * @defgroup hashtable-detail Base and Implementation Classes
* @ingroup unordered_associative_containers * @ingroup unordered_associative_containers
...@@ -2122,8 +2118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2122,8 +2118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
//@} hashtable-detail //@} hashtable-detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // _HASHTABLE_POLICY_H #endif // _HASHTABLE_POLICY_H
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Tp, typename _Alloc> template<typename _Tp, typename _Alloc>
...@@ -594,6 +595,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -594,6 +595,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
} }
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _LIST_TCC */ #endif /* _LIST_TCC */
......
...@@ -47,10 +47,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -47,10 +47,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__addressof(_Tp& __r) _GLIBCXX_NOEXCEPT __addressof(_Tp& __r) _GLIBCXX_NOEXCEPT
{ return __builtin_addressof(__r); } { return __builtin_addressof(__r); }
#if __cplusplus >= 201103L
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
#if __cplusplus >= 201103L
#include <type_traits> // Brings in std::declval too. #include <type_traits> // Brings in std::declval too.
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
...@@ -153,8 +154,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -153,8 +154,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
/// @} group utilities /// @} group utilities
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#define _GLIBCXX_MOVE(__val) std::move(__val) #define _GLIBCXX_MOVE(__val) std::move(__val)
#define _GLIBCXX_FORWARD(_Tp, __val) std::forward<_Tp>(__val) #define _GLIBCXX_FORWARD(_Tp, __val) std::forward<_Tp>(__val)
...@@ -163,10 +162,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -163,10 +162,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#define _GLIBCXX_FORWARD(_Tp, __val) (__val) #define _GLIBCXX_FORWARD(_Tp, __val) (__val)
#endif #endif
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @addtogroup utilities * @addtogroup utilities
* @{ * @{
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail { _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail {
/** /**
* @brief Struct for delimited strings. * @brief Struct for delimited strings.
*/ */
...@@ -155,9 +155,9 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -155,9 +155,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
return __is; return __is;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -58,15 +58,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -58,15 +58,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_RealType _RealType
generate_canonical(_UniformRandomNumberGenerator& __g); generate_canonical(_UniformRandomNumberGenerator& __g);
_GLIBCXX_END_NAMESPACE_VERSION
/* /*
* Implementation-space details. * Implementation-space details.
*/ */
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UIntType, size_t __w, template<typename _UIntType, size_t __w,
bool = __w < static_cast<size_t> bool = __w < static_cast<size_t>
(std::numeric_limits<_UIntType>::digits)> (std::numeric_limits<_UIntType>::digits)>
...@@ -189,11 +185,8 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -189,11 +185,8 @@ _GLIBCXX_END_NAMESPACE_VERSION
_Engine& _M_g; _Engine& _M_g;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @addtogroup random_generators Random Number Generators * @addtogroup random_generators Random Number Generators
* @ingroup random * @ingroup random
......
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/* /*
* (Further) implementation-space details. * (Further) implementation-space details.
*/ */
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// General case for x = (ax + c) mod m -- use Schrage's algorithm // General case for x = (ax + c) mod m -- use Schrage's algorithm
// to avoid integer overflow. // to avoid integer overflow.
// //
...@@ -89,11 +89,8 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -89,11 +89,8 @@ namespace std _GLIBCXX_VISIBILITY(default)
return __result; return __result;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m> template<typename _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
constexpr _UIntType constexpr _UIntType
linear_congruential_engine<_UIntType, __a, __c, __m>::multiplier; linear_congruential_engine<_UIntType, __a, __c, __m>::multiplier;
......
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
// Result of merging regex_match and regex_search. // Result of merging regex_match and regex_search.
// //
// __policy now can be _S_auto (auto dispatch) and _S_alternate (use // __policy now can be _S_auto (auto dispatch) and _S_alternate (use
...@@ -118,12 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -118,12 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
return __ret; return __ret;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Ch_type> template<typename _Ch_type>
template<typename _Fwd_iter> template<typename _Fwd_iter>
typename regex_traits<_Ch_type>::string_type typename regex_traits<_Ch_type>::string_type
...@@ -663,4 +659,3 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -663,4 +659,3 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
/** /**
* @defgroup regex-detail Base and Implementation Classes * @defgroup regex-detail Base and Implementation Classes
* @ingroup regex * @ingroup regex
...@@ -393,8 +393,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -393,8 +393,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
//@} regex-detail //@} regex-detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <bits/regex_automaton.tcc> #include <bits/regex_automaton.tcc>
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
#ifdef _GLIBCXX_DEBUG #ifdef _GLIBCXX_DEBUG
inline std::ostream& inline std::ostream&
_State_base::_M_print(std::ostream& ostr) const _State_base::_M_print(std::ostream& ostr) const
...@@ -233,7 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -233,7 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
return _StateSeq(_M_nfa, __m[_M_start], __m[_M_end]); return _StateSeq(_M_nfa, __m[_M_start], __m[_M_end]);
} }
} // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail
} // namespace } // namespace
...@@ -37,12 +37,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 ...@@ -37,12 +37,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
class regex_traits; class regex_traits;
_GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @addtogroup regex-detail * @addtogroup regex-detail
* @{ * @{
...@@ -575,8 +572,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -575,8 +572,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
//@} regex-detail //@} regex-detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <bits/regex_compiler.tcc> #include <bits/regex_compiler.tcc>
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
template<typename _TraitsT> template<typename _TraitsT>
_Compiler<_TraitsT>:: _Compiler<_TraitsT>::
_Compiler(_IterT __b, _IterT __e, _Compiler(_IterT __b, _IterT __e,
...@@ -633,7 +633,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -633,7 +633,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return false; return false;
}() ^ _M_is_non_matching; }() ^ _M_is_non_matching;
} }
} // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail
} // namespace } // namespace
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup regex Regular Expressions * @defgroup regex Regular Expressions
* *
...@@ -45,8 +47,6 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -45,8 +47,6 @@ namespace std _GLIBCXX_VISIBILITY(default)
*/ */
namespace regex_constants namespace regex_constants
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @name 5.1 Regular Expression Syntax Options * @name 5.1 Regular Expression Syntax Options
*/ */
...@@ -408,10 +408,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -408,10 +408,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return __a = __a ^ __b; } { return __a = __a ^ __b; }
//@} //@}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace regex_constants } // namespace regex_constants
/* @} */ // group regex /* @} */ // group regex
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @addtogroup regex * @addtogroup regex
* @{ * @{
...@@ -39,8 +41,6 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -39,8 +41,6 @@ namespace std _GLIBCXX_VISIBILITY(default)
namespace regex_constants namespace regex_constants
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @name 5.3 Error Types * @name 5.3 Error Types
*/ */
...@@ -120,11 +120,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -120,11 +120,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr error_type error_stack(_S_error_stack); constexpr error_type error_stack(_S_error_stack);
//@} //@}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace regex_constants } // namespace regex_constants
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// [7.8] Class regex_error // [7.8] Class regex_error
/** /**
* @brief A regular expression exception class. * @brief A regular expression exception class.
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
/** /**
* @addtogroup regex-detail * @addtogroup regex-detail
* @{ * @{
...@@ -251,8 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -251,8 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
//@} regex-detail //@} regex-detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <bits/regex_executor.tcc> #include <bits/regex_executor.tcc>
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
template<typename _BiIter, typename _Alloc, typename _TraitsT, template<typename _BiIter, typename _Alloc, typename _TraitsT,
bool __dfs_mode> bool __dfs_mode>
bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>:: bool _Executor<_BiIter, _Alloc, _TraitsT, __dfs_mode>::
...@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -513,7 +513,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __left_is_word != __right_is_word; return __left_is_word != __right_is_word;
} }
} // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail
} // namespace } // namespace
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
/** /**
* @addtogroup regex-detail * @addtogroup regex-detail
* @{ * @{
...@@ -265,8 +265,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -265,8 +265,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
//@} regex-detail //@} regex-detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <bits/regex_scanner.tcc> #include <bits/regex_scanner.tcc>
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
template<typename _CharT> template<typename _CharT>
_Scanner<_CharT>:: _Scanner<_CharT>::
_Scanner(typename _Scanner::_IterT __begin, _Scanner(typename _Scanner::_IterT __begin,
...@@ -584,6 +584,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -584,6 +584,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
...@@ -1203,6 +1203,7 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1203,6 +1203,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Confluent hypergeometric functions // Confluent hypergeometric functions
...@@ -1302,6 +1303,7 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) ...@@ -1302,6 +1303,7 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
return std::__detail::__hyperg<__type>(__a, __b, __c, __x); return std::__detail::__hyperg<__type>(__a, __b, __c, __x);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __gnu_cxx } // namespace __gnu_cxx
#pragma GCC visibility pop #pragma GCC visibility pop
......
...@@ -3857,8 +3857,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -3857,8 +3857,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif // C++11 #endif // C++11
_GLIBCXX_END_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_ALGO _GLIBCXX_BEGIN_NAMESPACE_ALGO
/** /**
...@@ -5839,6 +5837,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5839,6 +5837,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
#endif // C++14 #endif // C++14
_GLIBCXX_END_NAMESPACE_ALGO _GLIBCXX_END_NAMESPACE_ALGO
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_ALGO_H */ #endif /* _STL_ALGO_H */
...@@ -1020,8 +1020,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1020,8 +1020,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__lg(unsigned long long __n) __lg(unsigned long long __n)
{ return sizeof(long long) * __CHAR_BIT__ - 1 - __builtin_clzll(__n); } { return sizeof(long long) * __CHAR_BIT__ - 1 - __builtin_clzll(__n); }
_GLIBCXX_END_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_ALGO _GLIBCXX_BEGIN_NAMESPACE_ALGO
/** /**
...@@ -1411,6 +1409,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -1411,6 +1409,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
#endif #endif
_GLIBCXX_END_NAMESPACE_ALGO _GLIBCXX_END_NAMESPACE_ALGO
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
// NB: This file is included within many other C++ includes, as a way // NB: This file is included within many other C++ includes, as a way
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
typedef unsigned long _Bit_type; typedef unsigned long _Bit_type;
...@@ -552,6 +553,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -552,6 +553,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
}; };
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
// Declare a partial specialization of vector<T, Alloc>. // Declare a partial specialization of vector<T, Alloc>.
...@@ -559,6 +561,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER ...@@ -559,6 +561,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/** /**
...@@ -1305,6 +1308,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1305,6 +1308,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
}; };
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
......
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/** /**
...@@ -2325,6 +2326,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -2325,6 +2326,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#undef _GLIBCXX_DEQUE_BUF_SIZE #undef _GLIBCXX_DEQUE_BUF_SIZE
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_DEQUE_H */ #endif /* _STL_DEQUE_H */
...@@ -984,15 +984,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -984,15 +984,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__niter_base(__gnu_cxx::__normal_iterator<_Iterator, _Container> __it) __niter_base(__gnu_cxx::__normal_iterator<_Iterator, _Container> __it)
{ return __it.base(); } { return __it.base(); }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @addtogroup iterators * @addtogroup iterators
* @{ * @{
...@@ -1243,9 +1236,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1243,9 +1236,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-> decltype(__miter_base(__it.base())) -> decltype(__miter_base(__it.base()))
{ return __miter_base(__it.base()); } { return __miter_base(__it.base()); }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter) #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter)
#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) \ #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) \
std::__make_move_if_noexcept_iterator(_Iter) std::__make_move_if_noexcept_iterator(_Iter)
...@@ -1254,6 +1244,9 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1254,6 +1244,9 @@ _GLIBCXX_END_NAMESPACE_VERSION
#define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) (_Iter) #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) (_Iter)
#endif // C++11 #endif // C++11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#ifdef _GLIBCXX_DEBUG #ifdef _GLIBCXX_DEBUG
# include <debug/stl_iterator.h> # include <debug/stl_iterator.h>
#endif #endif
......
...@@ -66,14 +66,14 @@ ...@@ -66,14 +66,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
// Forward declaration for the overloads of __distance. // Forward declaration for the overloads of __distance.
template <typename> struct _List_iterator; template <typename> struct _List_iterator;
template <typename> struct _List_const_iterator; template <typename> struct _List_const_iterator;
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _InputIterator> template<typename _InputIterator>
inline _GLIBCXX14_CONSTEXPR inline _GLIBCXX14_CONSTEXPR
typename iterator_traits<_InputIterator>::difference_type typename iterator_traits<_InputIterator>::difference_type
......
...@@ -66,10 +66,10 @@ ...@@ -66,10 +66,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Supporting structures are split into common and templated // Supporting structures are split into common and templated
// types; the latter publicly inherits from the former in an // types; the latter publicly inherits from the former in an
// effort to reduce code duplication. This results in some // effort to reduce code duplication. This results in some
...@@ -157,8 +157,6 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -157,8 +157,6 @@ namespace std _GLIBCXX_VISIBILITY(default)
private: private:
_List_node_base* _M_base() { return this; } _List_node_base* _M_base() { return this; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace detail } // namespace detail
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
...@@ -1992,7 +1990,6 @@ _GLIBCXX_END_NAMESPACE_CXX11 ...@@ -1992,7 +1990,6 @@ _GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if _GLIBCXX_USE_CXX11_ABI #if _GLIBCXX_USE_CXX11_ABI
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Detect when distance is used to compute the size of the whole list. // Detect when distance is used to compute the size of the whole list.
template<typename _Tp> template<typename _Tp>
...@@ -2026,9 +2023,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2026,9 +2023,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
return __n; return __n;
} }
#endif
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
#endif
} // namespace std } // namespace std
#endif /* _STL_LIST_H */ #endif /* _STL_LIST_H */
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template <typename _Key, typename _Tp, typename _Compare, typename _Alloc> template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
...@@ -1437,7 +1438,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1437,7 +1438,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::map access to internals of compatible maps. // Allow std::map access to internals of compatible maps.
template<typename _Key, typename _Val, typename _Cmp1, typename _Alloc, template<typename _Key, typename _Val, typename _Cmp1, typename _Alloc,
typename _Cmp2> typename _Cmp2>
...@@ -1456,9 +1456,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1456,9 +1456,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_tree(_GLIBCXX_STD_C::multimap<_Key, _Val, _Cmp2, _Alloc>& __map) _S_get_tree(_GLIBCXX_STD_C::multimap<_Key, _Val, _Cmp2, _Alloc>& __map)
{ return __map._M_t; } { return __map._M_t; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_MAP_H */ #endif /* _STL_MAP_H */
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template <typename _Key, typename _Tp, typename _Compare, typename _Alloc> template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
...@@ -1102,7 +1103,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1102,7 +1103,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::multimap access to internals of compatible maps. // Allow std::multimap access to internals of compatible maps.
template<typename _Key, typename _Val, typename _Cmp1, typename _Alloc, template<typename _Key, typename _Val, typename _Cmp1, typename _Alloc,
typename _Cmp2> typename _Cmp2>
...@@ -1121,9 +1121,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1121,9 +1121,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_tree(_GLIBCXX_STD_C::multimap<_Key, _Val, _Cmp2, _Alloc>& __map) _S_get_tree(_GLIBCXX_STD_C::multimap<_Key, _Val, _Cmp2, _Alloc>& __map)
{ return __map._M_t; } { return __map._M_t; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_MULTIMAP_H */ #endif /* _STL_MULTIMAP_H */
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Key, typename _Compare, typename _Alloc> template<typename _Key, typename _Compare, typename _Alloc>
...@@ -953,7 +954,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -953,7 +954,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::multiset access to internals of compatible sets. // Allow std::multiset access to internals of compatible sets.
template<typename _Val, typename _Cmp1, typename _Alloc, typename _Cmp2> template<typename _Val, typename _Cmp1, typename _Alloc, typename _Cmp2>
struct struct
...@@ -971,9 +971,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -971,9 +971,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_tree(_GLIBCXX_STD_C::multiset<_Val, _Cmp2, _Alloc>& __set) _S_get_tree(_GLIBCXX_STD_C::multiset<_Val, _Cmp2, _Alloc>& __set)
{ return __set._M_t; } { return __set._M_t; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_MULTISET_H */ #endif /* _STL_MULTISET_H */
...@@ -66,10 +66,10 @@ ...@@ -66,10 +66,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace rel_ops namespace rel_ops
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** @namespace std::rel_ops /** @namespace std::rel_ops
* @brief The generated relational operators are sequestered here. * @brief The generated relational operators are sequestered here.
*/ */
...@@ -125,10 +125,9 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -125,10 +125,9 @@ namespace std _GLIBCXX_VISIBILITY(default)
inline bool inline bool
operator>=(const _Tp& __x, const _Tp& __y) operator>=(const _Tp& __x, const _Tp& __y)
{ return !(__x < __y); } { return !(__x < __y); }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace rel_ops } // namespace rel_ops
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_RELOPS_H */ #endif /* _STL_RELOPS_H */
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Key, typename _Compare, typename _Alloc> template<typename _Key, typename _Compare, typename _Alloc>
...@@ -969,7 +970,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -969,7 +970,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::set access to internals of compatible sets. // Allow std::set access to internals of compatible sets.
template<typename _Val, typename _Cmp1, typename _Alloc, typename _Cmp2> template<typename _Val, typename _Cmp1, typename _Alloc, typename _Cmp2>
struct struct
...@@ -986,8 +986,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -986,8 +986,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_tree(_GLIBCXX_STD_C::multiset<_Val, _Cmp2, _Alloc>& __set) _S_get_tree(_GLIBCXX_STD_C::multiset<_Val, _Cmp2, _Alloc>& __set)
{ return __set._M_t; } { return __set._M_t; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} //namespace std } //namespace std
#endif /* _STL_SET_H */ #endif /* _STL_SET_H */
...@@ -73,6 +73,7 @@ __sanitizer_annotate_contiguous_container(const void*, const void*, ...@@ -73,6 +73,7 @@ __sanitizer_annotate_contiguous_container(const void*, const void*,
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// See bits/stl_deque.h's _Deque_base for an explanation. /// See bits/stl_deque.h's _Deque_base for an explanation.
...@@ -313,7 +314,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -313,7 +314,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
} }
}; };
/** /**
* @brief A standard container which offers fixed time access to * @brief A standard container which offers fixed time access to
* individual elements in any order. * individual elements in any order.
...@@ -1789,6 +1789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1789,6 +1789,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ __x.swap(__y); } { __x.swap(__y); }
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _STL_VECTOR_H */ #endif /* _STL_VECTOR_H */
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/* Determine whether number is a power of 2. */ /* Determine whether number is a power of 2. */
template<typename _Tp> template<typename _Tp>
inline bool inline bool
...@@ -47,11 +47,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -47,11 +47,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
return ((__x - 1) & __x) == 0; return ((__x - 1) & __x) == 0;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Uniform discrete distribution for random numbers. * @brief Uniform discrete distribution for random numbers.
* A discrete random distribution on the range @f$[min, max]@f$ with equal * A discrete random distribution on the range @f$[min, max]@f$ with equal
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Base types for unordered_map. /// Base types for unordered_map.
...@@ -1911,7 +1912,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1911,7 +1912,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::unordered_map access to internals of compatible maps. // Allow std::unordered_map access to internals of compatible maps.
template<typename _Key, typename _Val, typename _Hash1, typename _Eq1, template<typename _Key, typename _Val, typename _Hash1, typename _Eq1,
typename _Alloc, typename _Hash2, typename _Eq2> typename _Alloc, typename _Hash2, typename _Eq2>
...@@ -1959,9 +1959,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1959,9 +1959,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_table(unordered_multimap<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map) _S_get_table(unordered_multimap<_Key, _Val, _Hash2, _Eq2, _Alloc>& __map)
{ return __map._M_h; } { return __map._M_h; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _UNORDERED_MAP_H */ #endif /* _UNORDERED_MAP_H */
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
/// Base types for unordered_set. /// Base types for unordered_set.
...@@ -1557,7 +1558,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -1557,7 +1558,6 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201402L #if __cplusplus > 201402L
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Allow std::unordered_set access to internals of compatible sets. // Allow std::unordered_set access to internals of compatible sets.
template<typename _Val, typename _Hash1, typename _Eq1, typename _Alloc, template<typename _Val, typename _Hash1, typename _Eq1, typename _Alloc,
typename _Hash2, typename _Eq2> typename _Hash2, typename _Eq2>
...@@ -1604,9 +1604,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1604,9 +1604,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_S_get_table(unordered_multiset<_Val, _Hash2, _Eq2, _Alloc>& __set) _S_get_table(unordered_multiset<_Val, _Hash2, _Eq2, _Alloc>& __set)
{ return __set._M_h; } { return __set._M_h; }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _UNORDERED_SET_H */ #endif /* _UNORDERED_SET_H */
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CONTAINER _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
template<typename _Tp, typename _Alloc> template<typename _Tp, typename _Alloc>
...@@ -897,6 +898,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER ...@@ -897,6 +898,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#endif #endif
_GLIBCXX_END_NAMESPACE_CONTAINER _GLIBCXX_END_NAMESPACE_CONTAINER
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
......
...@@ -513,9 +513,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -513,9 +513,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
tanh(_Tp __x) tanh(_Tp __x)
{ return __builtin_tanh(__x); } { return __builtin_tanh(__x); }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#if _GLIBCXX_USE_C99_MATH #if _GLIBCXX_USE_C99_MATH
#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC #if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
...@@ -533,10 +530,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -533,10 +530,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#undef islessgreater #undef islessgreater
#undef isunordered #undef isunordered
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
#ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO_FP
...@@ -952,13 +945,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -952,13 +945,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __builtin_isunordered(__type(__f1), __type(__f2)); return __builtin_isunordered(__type(__f1), __type(__f2));
} }
#endif #endif // C++11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */ #endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
#endif #endif /* _GLIBCXX_USE_C99_MATH */
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
...@@ -1072,10 +1061,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1072,10 +1061,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#undef truncf #undef truncf
#undef truncl #undef truncl
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// types // types
using ::double_t; using ::double_t;
using ::float_t; using ::float_t;
...@@ -1856,17 +1841,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1856,17 +1841,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return __builtin_trunc(__x); } { return __builtin_trunc(__x); }
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#endif // _GLIBCXX_USE_C99_MATH_TR1 #endif // _GLIBCXX_USE_C99_MATH_TR1
#endif // C++11 #endif // C++11
#if __cplusplus > 201402L #if __cplusplus > 201402L
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// [c.math.hypot3], three-dimensional hypotenuse // [c.math.hypot3], three-dimensional hypotenuse
#define __cpp_lib_hypot 201603 #define __cpp_lib_hypot 201603
...@@ -1905,10 +1883,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1905,10 +1883,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using __type = typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type; using __type = typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type;
return std::__hypot3<__type>(__x, __y, __z); return std::__hypot3<__type>(__x, __y, __z);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#endif // C++17 #endif // C++17
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#if _GLIBCXX_USE_STD_SPEC_FUNCS #if _GLIBCXX_USE_STD_SPEC_FUNCS
# include <bits/specfun.h> # include <bits/specfun.h>
......
...@@ -449,9 +449,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -449,9 +449,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
tanh(_Tp __x) tanh(_Tp __x)
{ return __builtin_tanh(__x); } { return __builtin_tanh(__x); }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#if _GLIBCXX_USE_C99_MATH #if _GLIBCXX_USE_C99_MATH
#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC #if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
...@@ -469,10 +466,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -469,10 +466,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#undef islessgreater #undef islessgreater
#undef isunordered #undef isunordered
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value, inline typename __gnu_cxx::__enable_if<__is_arithmetic<_Tp>::__value,
int>::__type int>::__type
...@@ -582,10 +575,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -582,10 +575,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __builtin_isunordered(__type(__f1), __type(__f2)); return __builtin_isunordered(__type(__f1), __type(__f2));
} }
#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
#endif /* _GLIBCXX_USE_C99_MATH */
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
#endif
#endif #endif
...@@ -42,6 +42,8 @@ that is currently not available. ...@@ -42,6 +42,8 @@ that is currently not available.
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup decimal Decimal Floating-Point Arithmetic * @defgroup decimal Decimal Floating-Point Arithmetic
* @ingroup numerics * @ingroup numerics
...@@ -55,8 +57,6 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -55,8 +57,6 @@ namespace std _GLIBCXX_VISIBILITY(default)
*/ */
namespace decimal namespace decimal
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
class decimal32; class decimal32;
class decimal64; class decimal64;
class decimal128; class decimal128;
...@@ -483,10 +483,10 @@ namespace decimal ...@@ -483,10 +483,10 @@ namespace decimal
}; };
#define _GLIBCXX_USE_DECIMAL_ 1 #define _GLIBCXX_USE_DECIMAL_ 1
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace decimal } // namespace decimal
// @} group decimal // @} group decimal
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <decimal/decimal.h> #include <decimal/decimal.h>
......
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace decimal namespace decimal
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// ISO/IEC TR 24733 3.2.[234].1 Construct/copy/destroy. // ISO/IEC TR 24733 3.2.[234].1 Construct/copy/destroy.
inline decimal32::decimal32(decimal64 __r) : __val(__r.__getval()) {} inline decimal32::decimal32(decimal64 __r) : __val(__r.__getval()) {}
...@@ -461,8 +461,9 @@ namespace decimal ...@@ -461,8 +461,9 @@ namespace decimal
#undef _DEFINE_DECIMAL_COMPARISON_LHS #undef _DEFINE_DECIMAL_COMPARISON_LHS
#undef _DEFINE_DECIMAL_COMPARISON_RHS #undef _DEFINE_DECIMAL_COMPARISON_RHS
#undef _DEFINE_DECIMAL_COMPARISONS #undef _DEFINE_DECIMAL_COMPARISONS
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace decimal } // namespace decimal
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif /* _GLIBCXX_DECIMAL_IMPL */ #endif /* _GLIBCXX_DECIMAL_IMPL */
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _ForwardIterator, typename _Searcher> template<typename _ForwardIterator, typename _Searcher>
inline _ForwardIterator inline _ForwardIterator
search(_ForwardIterator __first, _ForwardIterator __last, search(_ForwardIterator __first, _ForwardIterator __last,
...@@ -81,10 +81,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -81,10 +81,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__d, __d,
std::forward<_UniformRandomNumberGenerator>(__g)); std::forward<_UniformRandomNumberGenerator>(__g));
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup any Type-safe container of any type * @defgroup any Type-safe container of any type
* @ingroup experimental * @ingroup experimental
...@@ -520,9 +520,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -520,9 +520,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// @} group any // @} group any
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_make_array 201505 #define __cpp_lib_experimental_make_array 201505
/** /**
* @defgroup make_array Array creation functions * @defgroup make_array Array creation functions
...@@ -104,10 +104,10 @@ template <typename _Tp, size_t _Nm> ...@@ -104,10 +104,10 @@ template <typename _Tp, size_t _Nm>
} }
// @} group make_array // @} group make_array
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -39,13 +39,14 @@ ...@@ -39,13 +39,14 @@
namespace std namespace std
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Container, typename _Predicate> template<typename _Container, typename _Predicate>
void void
__erase_nodes_if(_Container& __cont, _Predicate __pred) __erase_nodes_if(_Container& __cont, _Predicate __pred)
...@@ -59,10 +60,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -59,10 +60,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
++__iter; ++__iter;
} }
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
} // inline namespace fundamentals_v2 } // inline namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup filesystem * @ingroup filesystem
* @{ * @{
...@@ -352,10 +352,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 ...@@ -352,10 +352,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
// @} group filesystem // @} group filesystem
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace filesystem } // namespace filesystem
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -40,17 +40,14 @@ ...@@ -40,17 +40,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
inline namespace v1 inline namespace v1
{ {
#if _GLIBCXX_INLINE_VERSION
inline namespace __8 { }
#endif
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_CXX11_ABI #if _GLIBCXX_USE_CXX11_ABI
inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { } inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
#endif #endif
...@@ -282,10 +279,11 @@ _GLIBCXX_END_NAMESPACE_CXX11 ...@@ -282,10 +279,11 @@ _GLIBCXX_END_NAMESPACE_CXX11
bool is_symlink(file_status) noexcept; bool is_symlink(file_status) noexcept;
// @} group filesystem // @} group filesystem
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace filesystem } // namespace filesystem
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -38,14 +38,14 @@ ...@@ -38,14 +38,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup filesystem * @ingroup filesystem
* @{ * @{
...@@ -286,10 +286,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -286,10 +286,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
path temp_directory_path(error_code& __ec); path temp_directory_path(error_code& __ec);
// @} group filesystem // @} group filesystem
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace filesystem } // namespace filesystem
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -55,13 +55,14 @@ ...@@ -55,13 +55,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_BEGIN_NAMESPACE_CXX11
#if __cplusplus == 201402L #if __cplusplus == 201402L
...@@ -1080,10 +1081,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 ...@@ -1080,10 +1081,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
// @} group filesystem // @} group filesystem
_GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace filesystem } // namespace filesystem
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -35,30 +35,25 @@ ...@@ -35,30 +35,25 @@
#if _GLIBCXX_INLINE_VERSION #if _GLIBCXX_INLINE_VERSION
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace chrono namespace chrono
{ {
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 { inline namespace __8 { } } inline namespace fundamentals_v1 { }
inline namespace fundamentals_v2 { inline namespace __8 { } } inline namespace fundamentals_v2 { }
} // namespace experimental } // namespace experimental
} // namespace chrono } // namespace chrono
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 { inline namespace fundamentals_v1 { }
inline namespace __8 { } inline namespace fundamentals_v2 { }
namespace __detail { inline namespace __8 { } } inline namespace literals { inline namespace string_view_literals { } }
}
inline namespace fundamentals_v2 {
inline namespace __8 { }
namespace pmr { inline namespace __8 { } }
namespace __detail { inline namespace __8 { } }
} // namespace fundamentals_v2
inline namespace literals { inline namespace string_view_literals {
inline namespace __8 { }
} } // namespace literals::string_view_literals
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
#endif #endif
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// 8.2.1 // 8.2.1
template<typename _Tp> class shared_ptr; template<typename _Tp> class shared_ptr;
...@@ -659,13 +659,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -659,13 +659,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
mutable weak_ptr<_Tp> _M_weak_this; mutable weak_ptr<_Tp> _M_weak_this;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/// std::hash specialization for shared_ptr. /// std::hash specialization for shared_ptr.
template<typename _Tp> template<typename _Tp>
struct hash<experimental::shared_ptr<_Tp>> struct hash<experimental::shared_ptr<_Tp>>
......
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
typename basic_string_view<_CharT, _Traits>::size_type typename basic_string_view<_CharT, _Traits>::size_type
basic_string_view<_CharT, _Traits>:: basic_string_view<_CharT, _Traits>::
...@@ -222,10 +222,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -222,10 +222,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
return npos; return npos;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -44,20 +44,21 @@ ...@@ -44,20 +44,21 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace chrono { namespace chrono {
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See C++14 §20.12.4, customization traits // See C++14 §20.12.4, customization traits
template <typename _Rep> template <typename _Rep>
constexpr bool treat_as_floating_point_v = constexpr bool treat_as_floating_point_v =
treat_as_floating_point<_Rep>::value; treat_as_floating_point<_Rep>::value;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
} // namespace chrono } // namespace chrono
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, typename _Alloc, typename _Predicate> template<typename _Tp, typename _Alloc, typename _Predicate>
void void
erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred) erase_if(deque<_Tp, _Alloc>& __cont, _Predicate __pred)
...@@ -63,19 +63,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -63,19 +63,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cont.end()); __cont.end());
} }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Tp>
namespace pmr { using deque = std::deque<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp>
using deque = std::deque<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -44,14 +44,14 @@ ...@@ -44,14 +44,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
namespace filesystem namespace filesystem
{ {
inline namespace v1 inline namespace v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @ingroup filesystem * @ingroup filesystem
*/ */
...@@ -65,11 +65,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -65,11 +65,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__what += " [" + _M_path2.string() + ']'; __what += " [" + _M_path2.string() + ']';
return __what; return __what;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace v1 } // namespace v1
} // namespace filesystem } // namespace filesystem
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++11 #endif // C++11
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, typename _Alloc, typename _Predicate> template<typename _Tp, typename _Alloc, typename _Predicate>
inline void inline void
erase_if(forward_list<_Tp, _Alloc>& __cont, _Predicate __pred) erase_if(forward_list<_Tp, _Alloc>& __cont, _Predicate __pred)
...@@ -59,19 +59,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -59,19 +59,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; }); erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; });
} }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Tp>
namespace pmr { using forward_list = std::forward_list<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_BEGIN_NAMESPACE_VERSION } // namespace pmr
template<typename _Tp>
using forward_list = std::forward_list<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See C++14 §20.9.9, Function object binders // See C++14 §20.9.9, Function object binders
/// Variable template for std::is_bind_expression /// Variable template for std::is_bind_expression
...@@ -368,14 +368,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -368,14 +368,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
return __last; return __last;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_not_fn 201406 #define __cpp_lib_experimental_not_fn 201406
/// [func.not_fn] Function template not_fn /// [func.not_fn] Function template not_fn
...@@ -386,10 +382,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -386,10 +382,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
return std::_Not_fn<std::decay_t<_Fn>>{std::forward<_Fn>(__fn), 0}; return std::_Not_fn<std::decay_t<_Fn>>{std::forward<_Fn>(__fn), 0};
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_ostream_joiner 201411 #define __cpp_lib_experimental_ostream_joiner 201411
/// Output iterator that inserts a delimiter between elements. /// Output iterator that inserts a delimiter between elements.
...@@ -105,10 +105,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -105,10 +105,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
make_ostream_joiner(basic_ostream<_CharT, _Traits>& __os, make_ostream_joiner(basic_ostream<_CharT, _Traits>& __os,
_DelimT&& __delimiter) _DelimT&& __delimiter)
{ return { __os, std::forward<_DelimT>(__delimiter) }; } { return { __os, std::forward<_DelimT>(__delimiter) }; }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, typename _Alloc, typename _Predicate> template<typename _Tp, typename _Alloc, typename _Predicate>
inline void inline void
erase_if(list<_Tp, _Alloc>& __cont, _Predicate __pred) erase_if(list<_Tp, _Alloc>& __cont, _Predicate __pred)
...@@ -59,19 +59,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -59,19 +59,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; }); erase_if(__cont, [&](__elem_type& __elem) { return __elem == __value; });
} }
_GLIBCXX_END_NAMESPACE_VERSION
namespace pmr { namespace pmr {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
using list = std::list<_Tp, polymorphic_allocator<_Tp>>; using list = std::list<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr } // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Tp, typename _Compare, typename _Alloc, template<typename _Key, typename _Tp, typename _Compare, typename _Alloc,
typename _Predicate> typename _Predicate>
inline void inline void
...@@ -59,26 +59,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -59,26 +59,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
erase_if(multimap<_Key, _Tp, _Compare, _Alloc>& __cont, _Predicate __pred) erase_if(multimap<_Key, _Tp, _Compare, _Alloc>& __cont, _Predicate __pred)
{ __detail::__erase_nodes_if(__cont, __pred); } { __detail::__erase_nodes_if(__cont, __pred); }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Key, typename _Tp, typename _Compare = less<_Key>>
namespace pmr { using map
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Tp, typename _Compare = less<_Key>>
using map
= std::map<_Key, _Tp, _Compare, = std::map<_Key, _Tp, _Compare,
polymorphic_allocator<pair<const _Key, _Tp>>>; polymorphic_allocator<pair<const _Key, _Tp>>>;
template<typename _Key, typename _Tp, typename _Compare = less<_Key>> template<typename _Key, typename _Tp, typename _Compare = less<_Key>>
using multimap using multimap
= std::multimap<_Key, _Tp, _Compare, = std::multimap<_Key, _Tp, _Compare,
polymorphic_allocator<pair<const _Key, _Tp>>>; polymorphic_allocator<pair<const _Key, _Tp>>>;
} // namespace pmr
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -47,12 +47,12 @@ ...@@ -47,12 +47,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_observer_ptr 201411 #define __cpp_lib_experimental_observer_ptr 201411
template <typename _Tp> template <typename _Tp>
...@@ -231,8 +231,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -231,8 +231,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
return !(__p1 < __p2); return !(__p1 < __p2);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
...@@ -250,6 +248,8 @@ template <typename _Tp> ...@@ -250,6 +248,8 @@ template <typename _Tp>
} }
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
#include <experimental/bits/lfts_config.h> #include <experimental/bits/lfts_config.h>
namespace std { namespace std {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental { namespace experimental {
inline namespace fundamentals_v2 { inline namespace fundamentals_v2 {
namespace pmr { namespace pmr {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_memory_resources 201402L #define __cpp_lib_experimental_memory_resources 201402L
class memory_resource; class memory_resource;
...@@ -379,11 +379,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -379,11 +379,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__r = new_delete_resource(); __r = new_delete_resource();
return __get_default_resource().exchange(__r); return __get_default_resource().exchange(__r);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr } // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_gcd_lcm 201411 #define __cpp_lib_experimental_gcd_lcm 201411
/// Greatest common divisor /// Greatest common divisor
...@@ -75,10 +75,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -75,10 +75,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools"); static_assert(!is_same<_Nn, bool>::value, "lcm arguments are not bools");
return std::__detail::__lcm(__m, __n); return std::__detail::__lcm(__m, __n);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -57,12 +57,12 @@ ...@@ -57,12 +57,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup optional Optional values * @defgroup optional Optional values
* @ingroup experimental * @ingroup experimental
...@@ -980,9 +980,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -980,9 +980,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ return optional<decay_t<_Tp>> { std::forward<_Tp>(__t) }; } { return optional<decay_t<_Tp>> { std::forward<_Tp>(__t) }; }
// @} group optional // @} group optional
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} } // namespace experimental
// [X.Y.12] // [X.Y.12]
template<typename _Tp> template<typename _Tp>
...@@ -1001,7 +1000,9 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1001,7 +1000,9 @@ _GLIBCXX_END_NAMESPACE_VERSION
return __t ? hash<_Tp> {}(*__t) : __magic_disengaged_hash; return __t ? hash<_Tp> {}(*__t) : __magic_disengaged_hash;
} }
}; };
}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#endif // C++14 #endif // C++14
......
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup propagate_const Const-propagating wrapper * @defgroup propagate_const Const-propagating wrapper
* @ingroup experimental * @ingroup experimental
...@@ -424,7 +424,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -424,7 +424,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
// @} group propagate_const // @} group propagate_const
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
...@@ -533,6 +532,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -533,6 +532,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef experimental::propagate_const<_Tp> second_argument_type; typedef experimental::propagate_const<_Tp> second_argument_type;
typedef bool result_type; typedef bool result_type;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
#include <experimental/bits/lfts_config.h> #include <experimental/bits/lfts_config.h>
namespace std { namespace std {
namespace experimental {
inline namespace fundamentals_v2 {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental {
inline namespace fundamentals_v2 {
#define __cpp_lib_experimental_randint 201511 #define __cpp_lib_experimental_randint 201511
inline std::default_random_engine& inline std::default_random_engine&
...@@ -71,10 +71,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -71,10 +71,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ {
_S_randint_engine().seed(__value); _S_randint_engine().seed(__value);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See C++14 §20.11.5, ratio comparison // See C++14 §20.11.5, ratio comparison
template <typename _R1, typename _R2> template <typename _R1, typename _R2>
constexpr bool ratio_equal_v = ratio_equal<_R1, _R2>::value; constexpr bool ratio_equal_v = ratio_equal<_R1, _R2>::value;
...@@ -63,10 +63,10 @@ template <typename _R1, typename _R2> ...@@ -63,10 +63,10 @@ template <typename _R1, typename _R2>
constexpr bool ratio_greater_v = ratio_greater<_R1, _R2>::value; constexpr bool ratio_greater_v = ratio_greater<_R1, _R2>::value;
template <typename _R1, typename _R2> template <typename _R1, typename _R2>
constexpr bool ratio_greater_equal_v = ratio_greater_equal<_R1, _R2>::value; constexpr bool ratio_greater_equal_v = ratio_greater_equal<_R1, _R2>::value;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -40,13 +40,14 @@ ...@@ -40,13 +40,14 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
namespace pmr namespace pmr
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CXX11 _GLIBCXX_BEGIN_NAMESPACE_CXX11
template<typename _BidirectionalIterator> template<typename _BidirectionalIterator>
...@@ -60,11 +61,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 ...@@ -60,11 +61,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11
typedef match_results<wstring::const_iterator> wsmatch; typedef match_results<wstring::const_iterator> wsmatch;
_GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr } // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Compare, typename _Alloc, template<typename _Key, typename _Compare, typename _Alloc,
typename _Predicate> typename _Predicate>
inline void inline void
...@@ -59,23 +59,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -59,23 +59,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
erase_if(multiset<_Key, _Compare, _Alloc>& __cont, _Predicate __pred) erase_if(multiset<_Key, _Compare, _Alloc>& __cont, _Predicate __pred)
{ __detail::__erase_nodes_if(__cont, __pred); } { __detail::__erase_nodes_if(__cont, __pred); }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Key, typename _Compare = less<_Key>>
namespace pmr { using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>;
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Compare = less<_Key>>
using set = std::set<_Key, _Compare, polymorphic_allocator<_Key>>;
template<typename _Key, typename _Compare = less<_Key>>
using multiset = std::multiset<_Key, _Compare,
polymorphic_allocator<_Key>>;
_GLIBCXX_END_NAMESPACE_VERSION template<typename _Key, typename _Compare = less<_Key>>
} // namespace pmr using multiset = std::multiset<_Key, _Compare,
polymorphic_allocator<_Key>>;
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <cstdint> #include <cstdint>
namespace std { namespace std {
namespace experimental {
inline namespace fundamentals_v2 {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental {
inline namespace fundamentals_v2 {
#define __cpp_lib_experimental_source_location 201505 #define __cpp_lib_experimental_source_location 201505
struct source_location struct source_location
...@@ -77,10 +77,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -77,10 +77,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
uint_least32_t _M_line; uint_least32_t _M_line;
uint_least32_t _M_col; uint_least32_t _M_col;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _CharT, typename _Traits, typename _Alloc, template<typename _CharT, typename _Traits, typename _Alloc,
typename _Predicate> typename _Predicate>
inline void inline void
...@@ -64,30 +64,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -64,30 +64,27 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cont.end()); __cont.end());
} }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
_GLIBCXX_BEGIN_NAMESPACE_CXX11
namespace pmr { // basic_string using polymorphic allocator in namespace pmr
_GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT, typename _Traits = char_traits<_CharT>>
_GLIBCXX_BEGIN_NAMESPACE_CXX11 using basic_string =
std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>;
// basic_string using polymorphic allocator in namespace pmr // basic_string typedef names using polymorphic allocator in namespace
template<typename _CharT, typename _Traits = char_traits<_CharT>> // std::experimental::pmr
using basic_string = typedef basic_string<char> string;
std::basic_string<_CharT, _Traits, polymorphic_allocator<_CharT>>; typedef basic_string<char16_t> u16string;
typedef basic_string<char32_t> u32string;
// basic_string typedef names using polymorphic allocator in namespace typedef basic_string<wchar_t> wstring;
// std::experimental::pmr
typedef basic_string<char> string;
typedef basic_string<char16_t> u16string;
typedef basic_string<char32_t> u32string;
typedef basic_string<wchar_t> wstring;
_GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
_GLIBCXX_END_NAMESPACE_CXX11
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_string_view 201411 #define __cpp_lib_experimental_string_view 201411
/** /**
...@@ -434,23 +434,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -434,23 +434,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const _CharT* _M_str; const _CharT* _M_str;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
// [string.view.comparison], non-member basic_string_view comparison functions // [string.view.comparison], non-member basic_string_view comparison functions
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Identity transform to create a non-deduced context, so that only one // Identity transform to create a non-deduced context, so that only one
// argument participates in template argument deduction and the other // argument participates in template argument deduction and the other
// argument gets implicitly converted to the deduced type. See n3766.html. // argument gets implicitly converted to the deduced type. See n3766.html.
template<typename _Tp> template<typename _Tp>
using __idt = common_type_t<_Tp>; using __idt = common_type_t<_Tp>;
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
inline bool inline bool
operator==(basic_string_view<_CharT, _Traits> __x, operator==(basic_string_view<_CharT, _Traits> __x,
...@@ -577,15 +571,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -577,15 +571,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using u16string_view = basic_string_view<char16_t>; using u16string_view = basic_string_view<char16_t>;
using u32string_view = basic_string_view<char32_t>; using u32string_view = basic_string_view<char32_t>;
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
// [string.view.hash], hash support: // [string.view.hash], hash support:
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp> template<typename _Tp>
struct hash; struct hash;
...@@ -647,7 +637,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -647,7 +637,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __is_fast_hash<hash<experimental::u32string_view>> : std::false_type struct __is_fast_hash<hash<experimental::u32string_view>> : std::false_type
{ }; { };
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
...@@ -656,8 +645,6 @@ namespace experimental ...@@ -656,8 +645,6 @@ namespace experimental
{ {
inline namespace string_view_literals inline namespace string_view_literals
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
inline constexpr basic_string_view<char> inline constexpr basic_string_view<char>
operator""sv(const char* __str, size_t __len) operator""sv(const char* __str, size_t __len)
{ return basic_string_view<char>{__str, __len}; } { return basic_string_view<char>{__str, __len}; }
...@@ -677,11 +664,11 @@ namespace experimental ...@@ -677,11 +664,11 @@ namespace experimental
operator""sv(const char32_t* __str, size_t __len) operator""sv(const char32_t* __str, size_t __len)
{ return basic_string_view<char32_t>{__str, __len}; } { return basic_string_view<char32_t>{__str, __len}; }
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace string_literals } // namespace string_literals
} // namespace literals } // namespace literals
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <experimental/bits/string_view.tcc> #include <experimental/bits/string_view.tcc>
......
...@@ -44,22 +44,22 @@ ...@@ -44,22 +44,22 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See C++14 §19.5, System error support // See C++14 §19.5, System error support
template <typename _Tp> template <typename _Tp>
constexpr bool is_error_code_enum_v = is_error_code_enum<_Tp>::value; constexpr bool is_error_code_enum_v = is_error_code_enum<_Tp>::value;
template <typename _Tp> template <typename _Tp>
constexpr bool is_error_condition_enum_v = constexpr bool is_error_condition_enum_v =
is_error_condition_enum<_Tp>::value; is_error_condition_enum<_Tp>::value;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See C++14 §20.4.2.5, tuple helper classes // See C++14 §20.4.2.5, tuple helper classes
template <typename _Tp> template <typename _Tp>
constexpr size_t tuple_size_v = tuple_size<_Tp>::value; constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
...@@ -71,10 +71,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -71,10 +71,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
std::forward<_Tuple>(__t), std::forward<_Tuple>(__t),
_Indices{}); _Indices{});
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -44,12 +44,12 @@ ...@@ -44,12 +44,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v1 inline namespace fundamentals_v1
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_type_trait_variable_templates 201402 #define __cpp_lib_experimental_type_trait_variable_templates 201402
// See C++14 §20.10.4.1, primary type categories // See C++14 §20.10.4.1, primary type categories
...@@ -218,13 +218,10 @@ template <typename _From, typename _To> ...@@ -218,13 +218,10 @@ template <typename _From, typename _To>
// raw_invocation_type (still unimplemented) // raw_invocation_type (still unimplemented)
// invocation_type_t (still unimplemented) // invocation_type_t (still unimplemented)
// raw_invocation_type_t (still unimplemented) // raw_invocation_type_t (still unimplemented)
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v1 } // namespace fundamentals_v1
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_detect 201505 #define __cpp_lib_experimental_detect 201505
// [meta.detect] // [meta.detect]
...@@ -299,10 +296,10 @@ template<typename... _Bn> ...@@ -299,10 +296,10 @@ template<typename... _Bn>
template<typename _Pp> template<typename _Pp>
constexpr bool negation_v constexpr bool negation_v
= negation<_Pp>::value; = negation<_Pp>::value;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // __cplusplus <= 201103L #endif // __cplusplus <= 201103L
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Tp, typename _Hash, typename _CPred, template<typename _Key, typename _Tp, typename _Hash, typename _CPred,
typename _Alloc, typename _Predicate> typename _Alloc, typename _Predicate>
inline void inline void
...@@ -61,28 +61,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -61,28 +61,24 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Predicate __pred) _Predicate __pred)
{ __detail::__erase_nodes_if(__cont, __pred); } { __detail::__erase_nodes_if(__cont, __pred); }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Key, typename _Tp, typename _Hash = hash<_Key>,
namespace pmr { typename _Pred = equal_to<_Key>>
_GLIBCXX_BEGIN_NAMESPACE_VERSION using unordered_map
template<typename _Key, typename _Tp, typename _Hash = hash<_Key>,
typename _Pred = equal_to<_Key>>
using unordered_map
= std::unordered_map<_Key, _Tp, _Hash, _Pred, = std::unordered_map<_Key, _Tp, _Hash, _Pred,
polymorphic_allocator<pair<const _Key, _Tp>>>; polymorphic_allocator<pair<const _Key, _Tp>>>;
template<typename _Key, typename _Tp, typename _Hash = hash<_Key>, template<typename _Key, typename _Tp, typename _Hash = hash<_Key>,
typename _Pred = equal_to<_Key>> typename _Pred = equal_to<_Key>>
using unordered_multimap using unordered_multimap
= std::unordered_multimap<_Key, _Tp, _Hash, _Pred, = std::unordered_multimap<_Key, _Tp, _Hash, _Pred,
polymorphic_allocator<pair<const _Key, _Tp>>>; polymorphic_allocator<pair<const _Key, _Tp>>>;
} // namespace pmr
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Key, typename _Hash, typename _CPred, typename _Alloc, template<typename _Key, typename _Hash, typename _CPred, typename _Alloc,
typename _Predicate> typename _Predicate>
inline void inline void
...@@ -61,27 +61,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -61,27 +61,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Predicate __pred) _Predicate __pred)
{ __detail::__erase_nodes_if(__cont, __pred); } { __detail::__erase_nodes_if(__cont, __pred); }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Key, typename _Hash = hash<_Key>,
namespace pmr { typename _Pred = equal_to<_Key>>
_GLIBCXX_BEGIN_NAMESPACE_VERSION using unordered_set
template<typename _Key, typename _Hash = hash<_Key>,
typename _Pred = equal_to<_Key>>
using unordered_set
= std::unordered_set<_Key, _Hash, _Pred, polymorphic_allocator<_Key>>; = std::unordered_set<_Key, _Hash, _Pred, polymorphic_allocator<_Key>>;
template<typename _Key, typename _Hash = hash<_Key>, template<typename _Key, typename _Hash = hash<_Key>,
typename _Pred = equal_to<_Key>> typename _Pred = equal_to<_Key>>
using unordered_multiset using unordered_multiset
= std::unordered_multiset<_Key, _Hash, _Pred, = std::unordered_multiset<_Key, _Hash, _Pred,
polymorphic_allocator<_Key>>; polymorphic_allocator<_Key>>;
} // namespace pmr
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -34,16 +34,16 @@ ...@@ -34,16 +34,16 @@
#include <experimental/bits/lfts_config.h> #include <experimental/bits/lfts_config.h>
namespace std { namespace std {
namespace experimental {
inline namespace fundamentals_v2 {
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental {
inline namespace fundamentals_v2 {
// 3.1.2, erased-type placeholder // 3.1.2, erased-type placeholder
using erased_type = std::__erased_type; using erased_type = std::__erased_type;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif #endif
...@@ -41,12 +41,12 @@ ...@@ -41,12 +41,12 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace experimental namespace experimental
{ {
inline namespace fundamentals_v2 inline namespace fundamentals_v2
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_experimental_erase_if 201411 #define __cpp_lib_experimental_erase_if 201411
template<typename _Tp, typename _Alloc, typename _Predicate> template<typename _Tp, typename _Alloc, typename _Predicate>
...@@ -65,19 +65,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -65,19 +65,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cont.end()); __cont.end());
} }
_GLIBCXX_END_NAMESPACE_VERSION namespace pmr {
template<typename _Tp>
namespace pmr { using vector = std::vector<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_BEGIN_NAMESPACE_VERSION } // namespace pmr
template<typename _Tp>
using vector = std::vector<_Tp, polymorphic_allocator<_Tp>>;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace pmr
} // namespace fundamentals_v2 } // namespace fundamentals_v2
} // namespace experimental } // namespace experimental
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif // C++14 #endif // C++14
......
...@@ -44,12 +44,13 @@ ...@@ -44,12 +44,13 @@
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
using std::size_t; using std::size_t;
using std::ptrdiff_t; using std::ptrdiff_t;
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** @class __mini_vector bitmap_allocator.h bitmap_allocator.h /** @class __mini_vector bitmap_allocator.h bitmap_allocator.h
* *
* @brief __mini_vector<> is a stripped down version of the * @brief __mini_vector<> is a stripped down version of the
...@@ -501,12 +502,8 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) ...@@ -501,12 +502,8 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
size_t __mask = 1 << __pos; size_t __mask = 1 << __pos;
*__pbmap |= __mask; *__pbmap |= __mask;
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** @brief Generic Version of the bsf instruction. /** @brief Generic Version of the bsf instruction.
*/ */
inline size_t inline size_t
...@@ -1134,4 +1131,3 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1134,4 +1131,3 @@ _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __gnu_cxx } // namespace __gnu_cxx
#endif #endif
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_CXX11
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_BEGIN_NAMESPACE_CXX11
/// Extension to use iconv for dealing with character encodings. /// Extension to use iconv for dealing with character encodings.
// This includes conversions and comparisons between various character // This includes conversions and comparisons between various character
...@@ -215,8 +215,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -215,8 +215,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef typename std::fpos<state_type> pos_type; typedef typename std::fpos<state_type> pos_type;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_CXX11 _GLIBCXX_END_NAMESPACE_CXX11
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
......
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail namespace __detail
{ {
enum { _S_max_rope_depth = 45 }; enum { _S_max_rope_depth = 45 };
...@@ -76,8 +78,6 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) ...@@ -76,8 +78,6 @@ namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
using std::allocator; using std::allocator;
using std::_Destroy; using std::_Destroy;
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// See libstdc++/36832. // See libstdc++/36832.
template<typename _ForwardIterator, typename _Allocator> template<typename _ForwardIterator, typename _Allocator>
void void
...@@ -2937,10 +2937,10 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -2937,10 +2937,10 @@ _GLIBCXX_END_NAMESPACE_VERSION
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace tr1
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
template<> template<>
struct hash<__gnu_cxx::crope> struct hash<__gnu_cxx::crope>
{ {
...@@ -2967,9 +2967,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2967,9 +2967,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return 13 * __str[0] + 5 * __str[__size - 1] + __size; return 13 * __str[0] + 5 * __str[__size - 1] + __size;
} }
}; };
} // namespace tr1
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace tr1
} // namespace std } // namespace std
# include <ext/ropeimpl.h> # include <ext/ropeimpl.h>
......
...@@ -127,18 +127,7 @@ namespace typelist ...@@ -127,18 +127,7 @@ namespace typelist
template<typename T1, typename T2, typename T3, template<typename T1, typename T2, typename T3,
typename T4, typename T5, typename T6> typename T4, typename T5, typename T6>
struct create6; struct create6;
} // namespace typelist
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace typelist
{
namespace detail namespace detail
{ {
template<typename Fn, typename Typelist_Chain> template<typename Fn, typename Typelist_Chain>
...@@ -366,10 +355,6 @@ namespace detail ...@@ -366,10 +355,6 @@ namespace detail
typedef typename append_type::type::root type; typedef typename append_type::type::root type;
}; };
} // namespace detail } // namespace detail
} // namespace typelist
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
#define _GLIBCXX_TYPELIST_CHAIN1(X0) __gnu_cxx::typelist::chain<X0, __gnu_cxx::typelist::null_type> #define _GLIBCXX_TYPELIST_CHAIN1(X0) __gnu_cxx::typelist::chain<X0, __gnu_cxx::typelist::null_type>
#define _GLIBCXX_TYPELIST_CHAIN2(X0, X1) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN1(X1) > #define _GLIBCXX_TYPELIST_CHAIN2(X0, X1) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN1(X1) >
...@@ -392,12 +377,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -392,12 +377,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#define _GLIBCXX_TYPELIST_CHAIN19(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN18(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) > #define _GLIBCXX_TYPELIST_CHAIN19(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN18(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18) >
#define _GLIBCXX_TYPELIST_CHAIN20(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN19(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) > #define _GLIBCXX_TYPELIST_CHAIN20(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) __gnu_cxx::typelist::chain<X0, _GLIBCXX_TYPELIST_CHAIN19(X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X12, X13, X14, X15, X16, X17, X18, X19) >
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace typelist
{
template<typename Fn, typename Typelist> template<typename Fn, typename Typelist>
void void
apply(Fn& fn, Typelist) apply(Fn& fn, Typelist)
......
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @defgroup chrono Time * @defgroup chrono Time
* @ingroup utilities * @ingroup utilities
...@@ -58,19 +60,13 @@ namespace std _GLIBCXX_VISIBILITY(default) ...@@ -58,19 +60,13 @@ namespace std _GLIBCXX_VISIBILITY(default)
*/ */
namespace chrono namespace chrono
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Rep, typename _Period = ratio<1>> template<typename _Rep, typename _Period = ratio<1>>
struct duration; struct duration;
template<typename _Clock, typename _Dur = typename _Clock::duration> template<typename _Clock, typename _Dur = typename _Clock::duration>
struct time_point; struct time_point;
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// 20.11.4.3 specialization of common_type (for duration, sfinae-friendly) // 20.11.4.3 specialization of common_type (for duration, sfinae-friendly)
template<typename _CT, typename _Period1, typename _Period2> template<typename _CT, typename _Period1, typename _Period2>
...@@ -117,12 +113,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -117,12 +113,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
common_type<_Duration1, _Duration2>>::type, _Clock>::type common_type<_Duration1, _Duration2>>::type, _Clock>::type
{ }; { };
_GLIBCXX_END_NAMESPACE_VERSION
namespace chrono namespace chrono
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Primary template for duration_cast impl. // Primary template for duration_cast impl.
template<typename _ToDur, typename _CF, typename _CR, template<typename _ToDur, typename _CF, typename _CR,
bool _NumIsOne = false, bool _DenIsOne = false> bool _NumIsOne = false, bool _DenIsOne = false>
...@@ -871,8 +863,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -871,8 +863,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
using high_resolution_clock = system_clock; using high_resolution_clock = system_clock;
} // end inline namespace _V2 } // end inline namespace _V2
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace chrono } // namespace chrono
#if __cplusplus > 201103L #if __cplusplus > 201103L
...@@ -883,8 +873,6 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -883,8 +873,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
{ {
inline namespace chrono_literals inline namespace chrono_literals
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Rep, unsigned long long _Val> template<typename _Rep, unsigned long long _Val>
struct _Checked_integral_constant struct _Checked_integral_constant
: integral_constant<_Rep, static_cast<_Rep>(_Val)> : integral_constant<_Rep, static_cast<_Rep>(_Val)>
...@@ -959,22 +947,19 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -959,22 +947,19 @@ _GLIBCXX_END_NAMESPACE_VERSION
operator""ns() operator""ns()
{ return __check_overflow<chrono::nanoseconds, _Digits...>(); } { return __check_overflow<chrono::nanoseconds, _Digits...>(); }
_GLIBCXX_END_NAMESPACE_VERSION
} // inline namespace chrono_literals } // inline namespace chrono_literals
} // inline namespace literals } // inline namespace literals
namespace chrono namespace chrono
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION using namespace literals::chrono_literals;
using namespace literals::chrono_literals;
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace chrono } // namespace chrono
#endif // __cplusplus > 201103L #endif // __cplusplus > 201103L
// @} group chrono // @} group chrono
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#endif //_GLIBCXX_USE_C99_STDINT_TR1 #endif //_GLIBCXX_USE_C99_STDINT_TR1
......
...@@ -1937,14 +1937,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1937,14 +1937,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return std::complex<__type>(__x, -__type()); return std::complex<__type>(__x, -__type());
} }
_GLIBCXX_END_NAMESPACE_VERSION
#if __cplusplus > 201103L #if __cplusplus > 201103L
inline namespace literals { inline namespace literals {
inline namespace complex_literals { inline namespace complex_literals {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#define __cpp_lib_complex_udls 201309 #define __cpp_lib_complex_udls 201309
constexpr std::complex<float> constexpr std::complex<float>
...@@ -1971,12 +1967,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1971,12 +1967,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator""il(unsigned long long __num) operator""il(unsigned long long __num)
{ return std::complex<long double>{0.0L, static_cast<long double>(__num)}; } { return std::complex<long double>{0.0L, static_cast<long double>(__num)}; }
_GLIBCXX_END_NAMESPACE_VERSION
} // inline namespace complex_literals } // inline namespace complex_literals
} // inline namespace literals } // inline namespace literals
#endif // C++14 #endif // C++14
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
#endif // C++11 #endif // C++11
......
...@@ -259,15 +259,12 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type) ...@@ -259,15 +259,12 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type)
*/ */
template<int _Num> struct _Placeholder { }; template<int _Num> struct _Placeholder { };
_GLIBCXX_END_NAMESPACE_VERSION
/** @namespace std::placeholders /** @namespace std::placeholders
* @brief ISO C++11 entities sub-namespace for functional. * @brief ISO C++11 entities sub-namespace for functional.
* @ingroup binders * @ingroup binders
*/ */
namespace placeholders namespace placeholders
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/* Define a large number of placeholders. There is no way to /* Define a large number of placeholders. There is no way to
* simplify this with variadic templates, because we're introducing * simplify this with variadic templates, because we're introducing
* unique names for each. * unique names for each.
...@@ -301,11 +298,8 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type) ...@@ -301,11 +298,8 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type)
extern const _Placeholder<27> _27; extern const _Placeholder<27> _27;
extern const _Placeholder<28> _28; extern const _Placeholder<28> _28;
extern const _Placeholder<29> _29; extern const _Placeholder<29> _29;
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* Partial specialization of is_placeholder that provides the placeholder * Partial specialization of is_placeholder that provides the placeholder
* number for the placeholder objects defined by libstdc++. * number for the placeholder objects defined by libstdc++.
......
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace __detail
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace __detail
{
// std::abs is not constexpr and doesn't support unsigned integers. // std::abs is not constexpr and doesn't support unsigned integers.
template<typename _Tp> template<typename _Tp>
constexpr constexpr
...@@ -117,11 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -117,11 +117,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* __detail::__abs_integral(__n) * __detail::__abs_integral(__n)
: 0; : 0;
} }
} // namespace __detail
_GLIBCXX_END_NAMESPACE_VERSION
}
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus > 201402L #if __cplusplus > 201402L
......
...@@ -427,23 +427,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -427,23 +427,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
size_t _M_len; size_t _M_len;
const _CharT* _M_str; const _CharT* _M_str;
}; };
_GLIBCXX_END_NAMESPACE_VERSION
// [string.view.comparison], non-member basic_string_view comparison function // [string.view.comparison], non-member basic_string_view comparison function
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// Identity transform to create a non-deduced context, so that only one // Identity transform to create a non-deduced context, so that only one
// argument participates in template argument deduction and the other // argument participates in template argument deduction and the other
// argument gets implicitly converted to the deduced type. See n3766.html. // argument gets implicitly converted to the deduced type. See n3766.html.
template<typename _Tp> template<typename _Tp>
using __idt = common_type_t<_Tp>; using __idt = common_type_t<_Tp>;
_GLIBCXX_END_NAMESPACE_VERSION
} }
_GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _CharT, typename _Traits> template<typename _CharT, typename _Traits>
inline bool inline bool
operator==(basic_string_view<_CharT, _Traits> __x, operator==(basic_string_view<_CharT, _Traits> __x,
...@@ -634,14 +629,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -634,14 +629,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
struct __is_fast_hash<hash<u32string_view>> : std::false_type struct __is_fast_hash<hash<u32string_view>> : std::false_type
{ }; { };
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
inline namespace literals inline namespace literals
{ {
inline namespace string_view_literals inline namespace string_view_literals
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
inline constexpr basic_string_view<char> inline constexpr basic_string_view<char>
operator""sv(const char* __str, size_t __len) operator""sv(const char* __str, size_t __len)
{ return basic_string_view<char>{__str, __len}; } { return basic_string_view<char>{__str, __len}; }
...@@ -661,11 +653,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -661,11 +653,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
operator""sv(const char32_t* __str, size_t __len) operator""sv(const char32_t* __str, size_t __len)
{ return basic_string_view<char32_t>{__str, __len}; } { return basic_string_view<char32_t>{__str, __len}; }
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace string_literals } // namespace string_literals
} // namespace literals } // namespace literals
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std } // namespace std
#include <bits/string_view.tcc> #include <bits/string_view.tcc>
......
...@@ -321,16 +321,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -321,16 +321,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __out << __id._M_thread; return __out << __id._M_thread;
} }
_GLIBCXX_END_NAMESPACE_VERSION
/** @namespace std::this_thread /** @namespace std::this_thread
* @brief ISO C++ 2011 entities sub-namespace for thread. * @brief ISO C++ 2011 entities sub-namespace for thread.
* 30.3.2 Namespace this_thread. * 30.3.2 Namespace this_thread.
*/ */
namespace this_thread namespace this_thread
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/// get_id /// get_id
inline thread::id inline thread::id
get_id() noexcept get_id() noexcept
...@@ -398,12 +394,11 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -398,12 +394,11 @@ _GLIBCXX_END_NAMESPACE_VERSION
__now = _Clock::now(); __now = _Clock::now();
} }
} }
_GLIBCXX_END_NAMESPACE_VERSION
} }
// @} group threads // @} group threads
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace tr1
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
/** /**
* @brief A standard container for storing a fixed size sequence of elements. * @brief A standard container for storing a fixed size sequence of elements.
* *
...@@ -243,9 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -243,9 +243,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline const _Tp& inline const _Tp&
get(const array<_Tp, _Nm>& __arr) get(const array<_Tp, _Nm>& __arr)
{ return __arr[_Int]; } { return __arr[_Int]; }
}
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} }
}
#endif // _GLIBCXX_TR1_ARRAY #endif // _GLIBCXX_TR1_ARRAY
...@@ -50,6 +50,8 @@ ...@@ -50,6 +50,8 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_STD_SPEC_FUNCS #if _GLIBCXX_USE_STD_SPEC_FUNCS
# define _GLIBCXX_MATH_NS ::std # define _GLIBCXX_MATH_NS ::std
#elif defined(_GLIBCXX_TR1_CMATH) #elif defined(_GLIBCXX_TR1_CMATH)
...@@ -64,8 +66,6 @@ namespace tr1 ...@@ -64,8 +66,6 @@ namespace tr1
// Implementation-space details. // Implementation-space details.
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Compute the gamma functions required by the Temme series * @brief Compute the gamma functions required by the Temme series
* expansions of @f$ N_\nu(x) @f$ and @f$ K_\nu(x) @f$. * expansions of @f$ N_\nu(x) @f$ and @f$ K_\nu(x) @f$.
...@@ -626,13 +626,13 @@ namespace tr1 ...@@ -626,13 +626,13 @@ namespace tr1
return __n_n; return __n_n;
} }
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
#undef _GLIBCXX_MATH_NS #undef _GLIBCXX_MATH_NS
#if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH)
} // namespace tr1 } // namespace tr1
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} }
#endif // _GLIBCXX_TR1_BESSEL_FUNCTION_TCC #endif // _GLIBCXX_TR1_BESSEL_FUNCTION_TCC
...@@ -48,6 +48,8 @@ ...@@ -48,6 +48,8 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
#if _GLIBCXX_USE_STD_SPEC_FUNCS #if _GLIBCXX_USE_STD_SPEC_FUNCS
# define _GLIBCXX_MATH_NS ::std # define _GLIBCXX_MATH_NS ::std
#elif defined(_GLIBCXX_TR1_CMATH) #elif defined(_GLIBCXX_TR1_CMATH)
...@@ -62,8 +64,6 @@ namespace tr1 ...@@ -62,8 +64,6 @@ namespace tr1
// Implementation-space details. // Implementation-space details.
namespace __detail namespace __detail
{ {
_GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @brief Return the beta function: \f$B(x,y)\f$. * @brief Return the beta function: \f$B(x,y)\f$.
* *
...@@ -195,13 +195,13 @@ namespace tr1 ...@@ -195,13 +195,13 @@ namespace tr1
else else
return __beta_lgamma(__x, __y); return __beta_lgamma(__x, __y);
} }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace __detail } // namespace __detail
#undef _GLIBCXX_MATH_NS #undef _GLIBCXX_MATH_NS
#if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH) #if ! _GLIBCXX_USE_STD_SPEC_FUNCS && defined(_GLIBCXX_TR1_CMATH)
} // namespace tr1 } // namespace tr1
#endif #endif
_GLIBCXX_END_NAMESPACE_VERSION
} }
#endif // _GLIBCXX_TR1_BETA_FUNCTION_TCC #endif // _GLIBCXX_TR1_BETA_FUNCTION_TCC
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace tr1
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
#if _GLIBCXX_USE_C99_MATH_TR1 #if _GLIBCXX_USE_C99_MATH_TR1
// Using declarations to bring names from libc's <math.h> into std::tr1. // Using declarations to bring names from libc's <math.h> into std::tr1.
...@@ -1059,16 +1059,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1059,16 +1059,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// @} // @}
#endif #endif /* _GLIBCXX_USE_C99_MATH_TR1 */
_GLIBCXX_END_NAMESPACE_VERSION
}
}
namespace std _GLIBCXX_VISIBILITY(default)
{
namespace tr1
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
// DR 550. What should the return type of pow(float,int) be? // DR 550. What should the return type of pow(float,int) be?
// NB: C++11 and TR1 != C++03. // NB: C++11 and TR1 != C++03.
...@@ -1135,20 +1126,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1135,20 +1126,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif // C++11 #endif // C++11
_GLIBCXX_END_NAMESPACE_VERSION
}
}
#if _GLIBCXX_USE_STD_SPEC_FUNCS #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 * @defgroup tr1_math_spec_func Mathematical Special Functions
* @ingroup numerics * @ingroup numerics
...@@ -1250,12 +1229,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1250,12 +1229,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
using std::sph_neumann; using std::sph_neumann;
/* @} */ // tr1_math_spec_func /* @} */ // tr1_math_spec_func
_GLIBCXX_END_NAMESPACE_VERSION
}
}
#else // ! _GLIBCXX_USE_STD_SPEC_FUNCS #else // ! _GLIBCXX_USE_STD_SPEC_FUNCS
} // namespace tr1
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#include <bits/stl_algobase.h> #include <bits/stl_algobase.h>
#include <limits> #include <limits>
#include <tr1/type_traits> #include <tr1/type_traits>
...@@ -1274,10 +1255,10 @@ _GLIBCXX_END_NAMESPACE_VERSION ...@@ -1274,10 +1255,10 @@ _GLIBCXX_END_NAMESPACE_VERSION
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
namespace tr1
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION _GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
/** /**
* @defgroup tr1_math_spec_func Mathematical Special Functions * @defgroup tr1_math_spec_func Mathematical Special Functions
* @ingroup numerics * @ingroup numerics
...@@ -1680,9 +1661,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -1680,9 +1661,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
/* @} */ // tr1_math_spec_func /* @} */ // tr1_math_spec_func
_GLIBCXX_END_NAMESPACE_VERSION
}
}
#endif // _GLIBCXX_USE_STD_SPEC_FUNCS #endif // _GLIBCXX_USE_STD_SPEC_FUNCS
} // namespace tr1
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace std
#endif // _GLIBCXX_TR1_CMATH #endif // _GLIBCXX_TR1_CMATH
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment