From 5fd1372fae457cadf88fce0986deb18fd46df0a8 Mon Sep 17 00:00:00 2001 From: redi Date: Fri, 9 Oct 2015 11:11:54 +0000 Subject: [PATCH] Add include/experimental/bits dir git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228645 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/include/Makefile.am | 35 +++++++++++++++------ libstdc++-v3/include/Makefile.in | 36 ++++++++++++++++------ .../include/experimental/{ => bits}/erase_if.h | 4 +-- .../include/experimental/{ => bits}/fs_dir.h | 0 .../include/experimental/{ => bits}/fs_fwd.h | 0 .../include/experimental/{ => bits}/fs_ops.h | 0 .../include/experimental/{ => bits}/fs_path.h | 0 .../experimental/{ => bits}/string_view.tcc | 0 libstdc++-v3/include/experimental/filesystem | 8 ++--- libstdc++-v3/include/experimental/map | 2 +- libstdc++-v3/include/experimental/set | 2 +- libstdc++-v3/include/experimental/string_view | 2 +- libstdc++-v3/include/experimental/unordered_map | 2 +- libstdc++-v3/include/experimental/unordered_set | 2 +- 14 files changed, 64 insertions(+), 29 deletions(-) rename libstdc++-v3/include/experimental/{ => bits}/erase_if.h (95%) rename libstdc++-v3/include/experimental/{ => bits}/fs_dir.h (100%) rename libstdc++-v3/include/experimental/{ => bits}/fs_fwd.h (100%) rename libstdc++-v3/include/experimental/{ => bits}/fs_ops.h (100%) rename libstdc++-v3/include/experimental/{ => bits}/fs_path.h (100%) rename libstdc++-v3/include/experimental/{ => bits}/string_view.tcc (100%) diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 74100f29925..2dc0d01241a 100644 --- 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 b72df264531..d545484a568 100644 --- 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 35b5b377889..e8bd72893bc 100644 --- a/libstdc++-v3/include/experimental/erase_if.h +++ b/libstdc++-v3/include/experimental/bits/erase_if.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// -*- C++ -*- // Copyright (C) 2015 Free Software Foundation, Inc. // @@ -22,7 +22,7 @@ // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // . -/** @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 db7ab1117da..671346382d4 100644 --- a/libstdc++-v3/include/experimental/filesystem +++ b/libstdc++-v3/include/experimental/filesystem @@ -35,10 +35,10 @@ # include #else -#include -#include -#include -#include +#include +#include +#include +#include #define __cpp_lib_experimental_filesystem 201406 diff --git a/libstdc++-v3/include/experimental/map b/libstdc++-v3/include/experimental/map index e4b3620e671..89bf2605091 100644 --- a/libstdc++-v3/include/experimental/map +++ b/libstdc++-v3/include/experimental/map @@ -36,7 +36,7 @@ #else #include -#include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/set b/libstdc++-v3/include/experimental/set index c742d9187f5..709fe327475 100644 --- a/libstdc++-v3/include/experimental/set +++ b/libstdc++-v3/include/experimental/set @@ -36,7 +36,7 @@ #else #include -#include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index 9dca400d75e..9931ad0557d 100644 --- 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 +#include #endif // __cplusplus <= 201103L diff --git a/libstdc++-v3/include/experimental/unordered_map b/libstdc++-v3/include/experimental/unordered_map index d3a578efe3a..c80c3828ded 100644 --- a/libstdc++-v3/include/experimental/unordered_map +++ b/libstdc++-v3/include/experimental/unordered_map @@ -36,7 +36,7 @@ #else #include -#include +#include namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/experimental/unordered_set b/libstdc++-v3/include/experimental/unordered_set index 2e5e08a9609..8461f9ccb91 100644 --- a/libstdc++-v3/include/experimental/unordered_set +++ b/libstdc++-v3/include/experimental/unordered_set @@ -36,7 +36,7 @@ #else #include -#include +#include namespace std _GLIBCXX_VISIBILITY(default) { -- 2.11.4.GIT