From a450315bee46036ffb589d0cdd2f89bb1618f68b Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 30 Apr 2015 18:03:01 +0100
Subject: Use __cxx11 namespace.

---
 libstdc++-v3/include/experimental/fs_dir.h   | 3 +++
 libstdc++-v3/include/experimental/fs_fwd.h   | 8 +++++++-
 libstdc++-v3/include/experimental/fs_path.h  | 2 ++
 libstdc++-v3/python/libstdcxx/v6/printers.py | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/experimental/fs_dir.h b/libstdc++-v3/include/experimental/fs_dir.h
index 6f036abab29..0538fd2a697 100644
--- a/libstdc++-v3/include/experimental/fs_dir.h
+++ b/libstdc++-v3/include/experimental/fs_dir.h
@@ -82,6 +82,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     perms	_M_perms;
   };
 
+_GLIBCXX_BEGIN_NAMESPACE_CXX11
 
   class directory_entry
   {
@@ -311,6 +312,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
              const recursive_directory_iterator& __rhs)
   { return !(__lhs == __rhs); }
 
+_GLIBCXX_END_NAMESPACE_CXX11
+
   // @} group filesystem
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
diff --git a/libstdc++-v3/include/experimental/fs_fwd.h b/libstdc++-v3/include/experimental/fs_fwd.h
index 04b0c5d4288..a5ed2c5de0e 100644
--- a/libstdc++-v3/include/experimental/fs_fwd.h
+++ b/libstdc++-v3/include/experimental/fs_fwd.h
@@ -47,6 +47,10 @@ inline namespace v1
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
+#if _GLIBCXX_USE_CXX11_ABI
+  inline namespace __cxx11 __attribute__((__abi_tag__ ("cxx11"))) { }
+#endif
+
   /**
    * @defgroup filesystem
    * @ingroup experimental
@@ -57,12 +61,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    * @{
    */
 
+  class file_status;
+_GLIBCXX_BEGIN_NAMESPACE_CXX11
   class path;
   class filesystem_error;
-  class file_status;
   class directory_entry;
   class directory_iterator;
   class recursive_directory_iterator;
+_GLIBCXX_END_NAMESPACE_CXX11
 
   struct space_info
   {
diff --git a/libstdc++-v3/include/experimental/fs_path.h b/libstdc++-v3/include/experimental/fs_path.h
index f00595f7d88..ffc49266b7a 100644
--- a/libstdc++-v3/include/experimental/fs_path.h
+++ b/libstdc++-v3/include/experimental/fs_path.h
@@ -59,6 +59,7 @@ namespace filesystem
 inline namespace v1
 {
 _GLIBCXX_BEGIN_NAMESPACE_VERSION
+_GLIBCXX_BEGIN_NAMESPACE_CXX11
 
   /**
    * @ingroup filesystem
@@ -1001,6 +1002,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   }
 
   // @} group filesystem
+_GLIBCXX_END_NAMESPACE_CXX11
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace v1
 } // namespace filesystem
diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 0c9d3616c48..37c3b9bf297 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -1383,6 +1383,8 @@ def build_libstdcxx_dictionary ():
     # Filesystem TS components
     libstdcxx_printer.add_version('std::experimental::filesystem::v1::',
                                   'path', StdExpPathPrinter)
+    libstdcxx_printer.add_version('std::experimental::filesystem::v1::__cxx11',
+                                  'path', StdExpPathPrinter)
 
     # Extensions.
     libstdcxx_printer.add_version('__gnu_cxx::', 'slist', StdSlistPrinter)
-- 
cgit v1.2.1