diff options
author | Jason Merrill <jason@redhat.com> | 2011-11-01 00:02:45 -0400 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 2011-11-01 00:02:45 -0400 |
commit | a7d5d7e221f85f6afc574beaa9d2dcabc67368d7 (patch) | |
tree | 0ededd9412f3ae08e4c8e3ac8f0e81721497a143 /libstdc++-v3/include | |
parent | e03ea4ad2c6fea4770c73a2938b604486559f52e (diff) | |
download | gcc-a7d5d7e221f85f6afc574beaa9d2dcabc67368d7.zip gcc-a7d5d7e221f85f6afc574beaa9d2dcabc67368d7.tar.gz gcc-a7d5d7e221f85f6afc574beaa9d2dcabc67368d7.tar.bz2 |
Makefile.am (install-freestanding-headers): Install c++0x_warning.h.
* include/Makefile.am (install-freestanding-headers): Install
c++0x_warning.h.
* libsupc++/initializer_list: Include it.
From-SVN: r180727
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r-- | libstdc++-v3/include/Makefile.am | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/Makefile.in | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/algorithmfwd.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/forward_list.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_bvector.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_deque.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_list.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_map.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_multimap.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_multiset.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_set.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/stl_vector.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/ext/vstring.h | 3 | ||||
-rw-r--r-- | libstdc++-v3/include/std/valarray | 2 |
15 files changed, 33 insertions, 2 deletions
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 02deefc..74acbf0 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1201,8 +1201,10 @@ endif # are installed by libsupc++, so only the first four and the sub-includes # are copied here. install-freestanding-headers: - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/bits $(mkinstalldirs) $(DESTDIR)${host_installdir} + $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/c++0x_warning.h \ + $(DESTDIR)${gxx_include_dir}/bits for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index e3e75a0..8b805ba 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1586,8 +1586,10 @@ ${pch3_output}: ${pch3_source} ${pch2_output} # are installed by libsupc++, so only the first four and the sub-includes # are copied here. install-freestanding-headers: - $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/bits $(mkinstalldirs) $(DESTDIR)${host_installdir} + $(INSTALL_DATA) ${glibcxx_srcdir}/include/bits/c++0x_warning.h \ + $(DESTDIR)${gxx_include_dir}/bits for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \ diff --git a/libstdc++-v3/include/bits/algorithmfwd.h b/libstdc++-v3/include/bits/algorithmfwd.h index cc0b98e..fbec55d 100644 --- a/libstdc++-v3/include/bits/algorithmfwd.h +++ b/libstdc++-v3/include/bits/algorithmfwd.h @@ -35,7 +35,9 @@ #include <bits/c++config.h> #include <bits/stl_pair.h> #include <bits/stl_iterator_base_types.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 5708194..0edb8b2 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -40,7 +40,9 @@ #include <ext/atomicity.h> #include <debug/debug.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/forward_list.h b/libstdc++-v3/include/bits/forward_list.h index c80ee50..0fc8323 100644 --- a/libstdc++-v3/include/bits/forward_list.h +++ b/libstdc++-v3/include/bits/forward_list.h @@ -33,7 +33,9 @@ #pragma GCC system_header #include <memory> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index bddecb0..8f28640 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -57,7 +57,9 @@ #ifndef _STL_BVECTOR_H #define _STL_BVECTOR_H 1 +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_deque.h b/libstdc++-v3/include/bits/stl_deque.h index 17ea01a..b924917 100644 --- a/libstdc++-v3/include/bits/stl_deque.h +++ b/libstdc++-v3/include/bits/stl_deque.h @@ -60,7 +60,9 @@ #include <bits/concept_check.h> #include <bits/stl_iterator_base_types.h> #include <bits/stl_iterator_base_funcs.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_list.h b/libstdc++-v3/include/bits/stl_list.h index 56ee2fb..fc1d8f8 100644 --- a/libstdc++-v3/include/bits/stl_list.h +++ b/libstdc++-v3/include/bits/stl_list.h @@ -58,7 +58,9 @@ #define _STL_LIST_H 1 #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 889e52b..45824f0 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -59,7 +59,9 @@ #include <bits/functexcept.h> #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index 6b74558..fd5a5a8 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -58,7 +58,9 @@ #define _STL_MULTIMAP_H 1 #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index 8b25a97..ab467c8 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -58,7 +58,9 @@ #define _STL_MULTISET_H 1 #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index b30966a..18fd117 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -58,7 +58,9 @@ #define _STL_SET_H 1 #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/bits/stl_vector.h b/libstdc++-v3/include/bits/stl_vector.h index 869bcf7..9b7b698 100644 --- a/libstdc++-v3/include/bits/stl_vector.h +++ b/libstdc++-v3/include/bits/stl_vector.h @@ -60,7 +60,9 @@ #include <bits/stl_iterator_base_funcs.h> #include <bits/functexcept.h> #include <bits/concept_check.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index 8e825e0..5720daf 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -32,7 +32,10 @@ #pragma GCC system_header +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif + #include <ext/vstring_util.h> #include <ext/rc_string_base.h> #include <ext/sso_string_base.h> diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index 3b155c5..a159aab5 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -39,7 +39,9 @@ #include <cmath> #include <algorithm> #include <debug/debug.h> +#ifdef __GXX_EXPERIMENTAL_CXX0X__ #include <initializer_list> +#endif namespace std _GLIBCXX_VISIBILITY(default) { |