Add include/experimental/bits dir

From-SVN: r228645

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 74100f299251568b518c018b90810b4c5bcc09c0..2dc0d01241ac79576de7b6c558d83482b91ae759 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -650,7 +650,6 @@ experimental_headers = \
        ${experimental_srcdir}/array \
        ${experimental_srcdir}/chrono \
        ${experimental_srcdir}/deque \
-       ${experimental_srcdir}/erase_if.h \
        ${experimental_srcdir}/forward_list \
        ${experimental_srcdir}/functional \
        ${experimental_srcdir}/iterator \
@@ -664,7 +663,6 @@ experimental_headers = \
        ${experimental_srcdir}/set \
        ${experimental_srcdir}/string \
        ${experimental_srcdir}/string_view \
-       ${experimental_srcdir}/string_view.tcc \
        ${experimental_srcdir}/system_error \
        ${experimental_srcdir}/tuple \
        ${experimental_srcdir}/type_traits \
@@ -673,15 +671,24 @@ experimental_headers = \
        ${experimental_srcdir}/vector \
        ${experimental_filesystem_headers}
 
+experimental_bits_srcdir = ${glibcxx_srcdir}/include/experimental/bits
+experimental_bits_builddir = ./experimental/bits
+experimental_bits_headers = \
+       ${experimental_bits_srcdir}/erase_if.h \
+       ${experimental_bits_srcdir}/string_view.tcc \
+       ${experimental_bits_filesystem_headers}
+
 if ENABLE_FILESYSTEM_TS
 experimental_filesystem_headers = \
-       ${experimental_srcdir}/filesystem \
-       ${experimental_srcdir}/fs_dir.h \
-       ${experimental_srcdir}/fs_fwd.h \
-       ${experimental_srcdir}/fs_ops.h \
-       ${experimental_srcdir}/fs_path.h
+       ${experimental_srcdir}/filesystem
+experimental_bits_filesystem_headers = \
+       ${experimental_bits_srcdir}/fs_dir.h \
+       ${experimental_bits_srcdir}/fs_fwd.h \
+       ${experimental_bits_srcdir}/fs_ops.h \
+       ${experimental_bits_srcdir}/fs_path.h
 else
 experimental_filesystem_headers =
+experimental_bits_filesystem_headers =
 endif
 
 # This is the common subset of C++ files that all three "C" header models use.
@@ -968,8 +975,8 @@ endif
 allstamped = \
        stamp-std stamp-bits stamp-bits-sup stamp-c_base stamp-c_compatibility \
        stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr2 stamp-decimal \
-       stamp-experimental stamp-debug stamp-parallel stamp-profile \
-       stamp-profile-impl stamp-host
+       stamp-experimental stamp-experimental-bits stamp-debug stamp-parallel \
+       stamp-profile stamp-profile-impl stamp-host
 
 # List of all files that are created by explicit building, editing, or
 # catenation.
@@ -1097,6 +1104,11 @@ stamp-experimental: ${experimental_headers}
        @-cd ${experimental_builddir} && $(LN_S) $? . 2>/dev/null
        @$(STAMP) stamp-experimental
 
+stamp-experimental-bits: ${experimental_bits_headers}
+       @-mkdir -p ${experimental_bits_builddir}
+       @-cd ${experimental_bits_builddir} && $(LN_S) $? . 2>/dev/null
+       @$(STAMP) stamp-experimental-bits
+
 stamp-debug: ${debug_headers}
        @-mkdir -p ${debug_builddir}
        @-cd ${debug_builddir} && $(LN_S) $? . 2>/dev/null
@@ -1369,6 +1381,9 @@ install-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${experimental_builddir}
        for file in ${experimental_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${experimental_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${experimental_bits_builddir}
+       for file in ${experimental_bits_headers}; do \
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${experimental_bits_builddir}; done
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done
@@ -1415,9 +1430,11 @@ clean-local:
 # be made.)
 .PRECIOUS: $(std_headers) $(c_base_headers) $(tr1_headers) $(tr2_headers)
           $(decimal_headers) $(ext_headers) $(experimental_headers)
+          $(experimental_bits_headers)
 $(std_headers): ; @:
 $(c_base_headers): ; @:
 $(tr1_headers): ; @:
 $(decimal_headers): ; @:
 $(ext_headers): ; @:
 $(experimental_headers): ; @:
+$(experimental_bits_headers): ; @:

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index b72df264531dee9623170adc5dabd309f4bed2aa..d545484a5680c6f89a10bf8ccc2d393307c817ab 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -939,7 +939,6 @@ experimental_headers = \
        ${experimental_srcdir}/array \
        ${experimental_srcdir}/chrono \
        ${experimental_srcdir}/deque \
-       ${experimental_srcdir}/erase_if.h \
        ${experimental_srcdir}/forward_list \
        ${experimental_srcdir}/functional \
        ${experimental_srcdir}/iterator \
@@ -953,7 +952,6 @@ experimental_headers = \
        ${experimental_srcdir}/set \
        ${experimental_srcdir}/string \
        ${experimental_srcdir}/string_view \
-       ${experimental_srcdir}/string_view.tcc \
        ${experimental_srcdir}/system_error \
        ${experimental_srcdir}/tuple \
        ${experimental_srcdir}/type_traits \
@@ -962,13 +960,23 @@ experimental_headers = \
        ${experimental_srcdir}/vector \
        ${experimental_filesystem_headers}
 
+experimental_bits_srcdir = ${glibcxx_srcdir}/include/experimental/bits
+experimental_bits_builddir = ./experimental/bits
+experimental_bits_headers = \
+       ${experimental_bits_srcdir}/erase_if.h \
+       ${experimental_bits_srcdir}/string_view.tcc \
+       ${experimental_bits_filesystem_headers}
+
 @ENABLE_FILESYSTEM_TS_FALSE@experimental_filesystem_headers = 
 @ENABLE_FILESYSTEM_TS_TRUE@experimental_filesystem_headers = \
-@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/filesystem \
-@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/fs_dir.h \
-@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/fs_fwd.h \
-@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/fs_ops.h \
-@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/fs_path.h
+@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_srcdir}/filesystem
+
+@ENABLE_FILESYSTEM_TS_FALSE@experimental_bits_filesystem_headers = 
+@ENABLE_FILESYSTEM_TS_TRUE@experimental_bits_filesystem_headers = \
+@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_bits_srcdir}/fs_dir.h \
+@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_bits_srcdir}/fs_fwd.h \
+@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_bits_srcdir}/fs_ops.h \
+@ENABLE_FILESYSTEM_TS_TRUE@    ${experimental_bits_srcdir}/fs_path.h
 
 
 # This is the common subset of C++ files that all three "C" header models use.
@@ -1245,8 +1253,8 @@ PCHFLAGS = -x c++-header -nostdinc++ $(CXXFLAGS) $(VTV_PCH_CXXFLAGS)
 allstamped = \
        stamp-std stamp-bits stamp-bits-sup stamp-c_base stamp-c_compatibility \
        stamp-backward stamp-ext stamp-pb stamp-tr1 stamp-tr2 stamp-decimal \
-       stamp-experimental stamp-debug stamp-parallel stamp-profile \
-       stamp-profile-impl stamp-host
+       stamp-experimental stamp-experimental-bits stamp-debug stamp-parallel \
+       stamp-profile stamp-profile-impl stamp-host
 
 
 # List of all files that are created by explicit building, editing, or
@@ -1542,6 +1550,11 @@ stamp-experimental: ${experimental_headers}
        @-cd ${experimental_builddir} && $(LN_S) $? . 2>/dev/null
        @$(STAMP) stamp-experimental
 
+stamp-experimental-bits: ${experimental_bits_headers}
+       @-mkdir -p ${experimental_bits_builddir}
+       @-cd ${experimental_bits_builddir} && $(LN_S) $? . 2>/dev/null
+       @$(STAMP) stamp-experimental-bits
+
 stamp-debug: ${debug_headers}
        @-mkdir -p ${debug_builddir}
        @-cd ${debug_builddir} && $(LN_S) $? . 2>/dev/null
@@ -1793,6 +1806,9 @@ install-headers:
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${experimental_builddir}
        for file in ${experimental_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${experimental_builddir}; done
+       $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${experimental_bits_builddir}
+       for file in ${experimental_bits_headers}; do \
+         $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${experimental_bits_builddir}; done
        $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir}
        for file in ${c_base_headers}; do \
          $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done
@@ -1836,12 +1852,14 @@ clean-local:
 # be made.)
 .PRECIOUS: $(std_headers) $(c_base_headers) $(tr1_headers) $(tr2_headers)
           $(decimal_headers) $(ext_headers) $(experimental_headers)
+          $(experimental_bits_headers)
 $(std_headers): ; @:
 $(c_base_headers): ; @:
 $(tr1_headers): ; @:
 $(decimal_headers): ; @:
 $(ext_headers): ; @:
 $(experimental_headers): ; @:
+$(experimental_bits_headers): ; @:
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/libstdc++-v3/include/experimental/erase_if.h b/libstdc++-v3/include/experimental/bits/erase_if.h
similarity index 95%
rename from libstdc++-v3/include/experimental/erase_if.h
rename to libstdc++-v3/include/experimental/bits/erase_if.h
index 35b5b37788911454028109c385309ef82b6daa47..e8bd72893bc1d2bc15c8460c1d3db488d2307bce 100644 (file)
--- a/libstdc++-v3/include/experimental/erase_if.h
+++ b/libstdc++-v3/include/experimental/bits/erase_if.h
@@ -1,4 +1,4 @@
-// <experimental/erase_if.h> -*- C++ -*-
+// <experimental/bits/erase_if.h> -*- C++ -*-
 
 // Copyright (C) 2015 Free Software Foundation, Inc.
 //
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file experimental/erase_if.h
+/** @file experimental/bits/erase_if.h
  *  This is an internal header file, included by other library headers.
  *  Do not attempt to use it directly.
  */

diff --git a/libstdc++-v3/include/experimental/fs_dir.h b/libstdc++-v3/include/experimental/bits/fs_dir.h
similarity index 100%
rename from libstdc++-v3/include/experimental/fs_dir.h
rename to libstdc++-v3/include/experimental/bits/fs_dir.h

diff --git a/libstdc++-v3/include/experimental/fs_fwd.h b/libstdc++-v3/include/experimental/bits/fs_fwd.h
similarity index 100%
rename from libstdc++-v3/include/experimental/fs_fwd.h
rename to libstdc++-v3/include/experimental/bits/fs_fwd.h

diff --git a/libstdc++-v3/include/experimental/fs_ops.h b/libstdc++-v3/include/experimental/bits/fs_ops.h
similarity index 100%
rename from libstdc++-v3/include/experimental/fs_ops.h
rename to libstdc++-v3/include/experimental/bits/fs_ops.h

diff --git a/libstdc++-v3/include/experimental/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h
similarity index 100%
rename from libstdc++-v3/include/experimental/fs_path.h
rename to libstdc++-v3/include/experimental/bits/fs_path.h

diff --git a/libstdc++-v3/include/experimental/string_view.tcc b/libstdc++-v3/include/experimental/bits/string_view.tcc
similarity index 100%
rename from libstdc++-v3/include/experimental/string_view.tcc
rename to libstdc++-v3/include/experimental/bits/string_view.tcc

diff --git a/libstdc++-v3/include/experimental/filesystem b/libstdc++-v3/include/experimental/filesystem
index db7ab1117da5cb6ec08fe22eb50e60d0273d0bf8..671346382d49053b639bc31109b6359971951d78 100644 (file)
--- a/libstdc++-v3/include/experimental/filesystem
+++ b/libstdc++-v3/include/experimental/filesystem
@@ -35,10 +35,10 @@
 # include <bits/c++0x_warning.h>
 #else
 
-#include <experimental/fs_fwd.h>
-#include <experimental/fs_path.h>
-#include <experimental/fs_dir.h>
-#include <experimental/fs_ops.h>
+#include <experimental/bits/fs_fwd.h>
+#include <experimental/bits/fs_path.h>
+#include <experimental/bits/fs_dir.h>
+#include <experimental/bits/fs_ops.h>
 
 #define __cpp_lib_experimental_filesystem 201406
 

diff --git a/libstdc++-v3/include/experimental/map b/libstdc++-v3/include/experimental/map
index e4b3620e6717b171dee68a70e9cdb7ef995a917c..89bf2605091e90561b86bed0492982079ecd3f0f 100644 (file)
--- a/libstdc++-v3/include/experimental/map
+++ b/libstdc++-v3/include/experimental/map
@@ -36,7 +36,7 @@
 #else
 
 #include <map>
-#include <experimental/erase_if.h>
+#include <experimental/bits/erase_if.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {

diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set
index c742d9187f51330a1ec4a6fdd4b36089fc299a34..709fe327475ea434c7fdf754030364d0cb11b972 100644 (file)
--- a/libstdc++-v3/include/experimental/set
+++ b/libstdc++-v3/include/experimental/set
@@ -36,7 +36,7 @@
 #else
 
 #include <set>
-#include <experimental/erase_if.h>
+#include <experimental/bits/erase_if.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {

diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view
index 9dca400d75e2d5e284c0246f88e1e1a60ff050a2..9931ad0557dc9abe931684ac0e9f4cce06e49cfe 100644 (file)
--- a/libstdc++-v3/include/experimental/string_view
+++ b/libstdc++-v3/include/experimental/string_view
@@ -686,7 +686,7 @@ _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace experimental
 } // namespace std
 
-#include <experimental/string_view.tcc>
+#include <experimental/bits/string_view.tcc>
 
 #endif // __cplusplus <= 201103L
 

diff --git a/libstdc++-v3/include/experimental/unordered_map b/libstdc++-v3/include/experimental/unordered_map
index d3a578efe3af30aec9302f390defad5a65f4b4a4..c80c3828dedfed59f624b0dc93823e5b2f125296 100644 (file)
--- a/libstdc++-v3/include/experimental/unordered_map
+++ b/libstdc++-v3/include/experimental/unordered_map
@@ -36,7 +36,7 @@
 #else
 
 #include <unordered_map>
-#include <experimental/erase_if.h>
+#include <experimental/bits/erase_if.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {

diff --git a/libstdc++-v3/include/experimental/unordered_set b/libstdc++-v3/include/experimental/unordered_set
index 2e5e08a9609f0bd6350587304e4e427b1ecafb67..8461f9ccb915018261fd4f9cf3826fe7fd9bd43d 100644 (file)
--- a/libstdc++-v3/include/experimental/unordered_set
+++ b/libstdc++-v3/include/experimental/unordered_set
@@ -36,7 +36,7 @@
 #else
 
 #include <unordered_set>
-#include <experimental/erase_if.h>
+#include <experimental/bits/erase_if.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {