From f67d541a07622725a97ac1fd3e80a56773fa186b Mon Sep 17 00:00:00 2001 From: bkoz Date: Tue, 11 Aug 2009 04:30:35 +0000 Subject: [PATCH 1/1] 2009-08-10 Benjamin Kosnik * include/std/future: Move error handling bits outside macro guard. * src/future.cc: Adjust. * include/precompiled/stdc++.h: Add future. * doc/xml/manual/using.xml: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150642 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/doc/xml/manual/using.xml | 15 ++++++++------- libstdc++-v3/include/precompiled/stdc++.h | 1 + libstdc++-v3/include/std/future | 12 ++++++------ libstdc++-v3/src/future.cc | 5 ----- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 85e3fbee67e..628ce72732e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2009-08-10 Benjamin Kosnik + * include/std/future: Move error handling bits outside macro guard. + * src/future.cc: Adjust. + + * include/precompiled/stdc++.h: Add future. + * doc/xml/manual/using.xml: Same. + +2009-08-10 Benjamin Kosnik + * src/hashtable.cc: Just definitions. * src/hashtable_c++0x.cc: Compile C++0x versions. * src/hash.cc: Same. diff --git a/libstdc++-v3/doc/xml/manual/using.xml b/libstdc++-v3/doc/xml/manual/using.xml index 1dfeb83cd7c..a32cdb1cd93 100644 --- a/libstdc++-v3/doc/xml/manual/using.xml +++ b/libstdc++-v3/doc/xml/manual/using.xml @@ -242,54 +242,55 @@ mode, i.e. -std=c++0x or -std=gnu++0x. functional +future initalizer_list iomanip ios -iosfwd +iosfwd iostream istream iterator limits -list +list locale map memory mutex -new +new numeric ostream queue random -ratio +ratio regex set sstream stack -stdexcept +stdexcept streambuf string system_error thread -tuple +tuple type_traits typeinfo unordered_map unordered_set -utility +utility valarray vector diff --git a/libstdc++-v3/include/precompiled/stdc++.h b/libstdc++-v3/include/precompiled/stdc++.h index 5782fa3b89a..6cae9e5e96d 100644 --- a/libstdc++-v3/include/precompiled/stdc++.h +++ b/libstdc++-v3/include/precompiled/stdc++.h @@ -98,6 +98,7 @@ #include #include #include +#include #include #include #include diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 53ad4fee503..badb6e07e5a 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -43,9 +43,6 @@ #include #include -#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \ - && defined(_GLIBCXX_ATOMIC_BUILTINS_4) - namespace std { /** @@ -111,6 +108,9 @@ namespace std template class promise; +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \ + && defined(_GLIBCXX_ATOMIC_BUILTINS_4) + // Holds the result of a future struct _Future_result_base { @@ -929,12 +929,12 @@ namespace std promise<_Result> _M_promise; }; - // @} group futures -} - #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 // && _GLIBCXX_ATOMIC_BUILTINS_4 + // @} group futures +} + #endif // __GXX_EXPERIMENTAL_CXX0X__ #endif // _GLIBCXX_FUTURE diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc index f4ef7856a18..967012a8ca6 100644 --- a/libstdc++-v3/src/future.cc +++ b/libstdc++-v3/src/future.cc @@ -24,8 +24,6 @@ #include -#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \ - && defined(_GLIBCXX_ATOMIC_BUILTINS_4) namespace { struct future_error_category : public std::error_category @@ -73,6 +71,3 @@ namespace std const char* future_error::what() const throw() { return _M_code.message().c_str(); } } - -#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1 - // && _GLIBCXX_ATOMIC_BUILTINS_4 -- 2.11.0