diff --git a/libstdc++-v3/src/c++11/chrono.cc b/libstdc++-v3/src/c++11/chrono.cc index 6825b5bc4bf..e52211d9aab 100644 --- a/libstdc++-v3/src/c++11/chrono.cc +++ b/libstdc++-v3/src/c++11/chrono.cc @@ -39,13 +39,8 @@ namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - namespace chrono { - // XXX GLIBCXX_ABI Deprecated - inline namespace _V2 { - constexpr bool system_clock::is_steady; system_clock::time_point @@ -93,9 +88,5 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return time_point(system_clock::now().time_since_epoch()); #endif } - - } // end inline namespace _V2 } // namespace chrono - -_GLIBCXX_END_NAMESPACE_VERSION } // namespace std diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index 7b1a5a20637..cc2c491cdbb 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -516,8 +516,6 @@ namespace namespace std _GLIBCXX_VISIBILITY(default) { -_GLIBCXX_BEGIN_NAMESPACE_VERSION - void __throw_system_error(int __i __attribute__((unused))) { @@ -527,10 +525,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION error_category::~error_category() = default; const error_category& - _V2::system_category() noexcept { return system_category_instance.obj; } + system_category() noexcept { return system_category_instance.obj; } const error_category& - _V2::generic_category() noexcept { return generic_category_instance.obj; } + generic_category() noexcept { return generic_category_instance.obj; } system_error::~system_error() = default; @@ -560,6 +558,4 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return {msg.c_str(), msg.length()}; } #endif - -_GLIBCXX_END_NAMESPACE_VERSION } // namespace