2009-08-10 Benjamin Kosnik <bkoz@redhat.com>

	* 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

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  <bkoz@redhat.com>
 
+	* 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  <bkoz@redhat.com>
+
 	* 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. <literal>-std=c++0x</literal> or <literal>-std=gnu++0x</literal>.
 </row>
 <row>
 <entry><filename class="headerfile">functional</filename></entry>
+<entry><filename class="headerfile">future</filename></entry>
 <entry><filename class="headerfile">initalizer_list</filename></entry>
 <entry><filename class="headerfile">iomanip</filename></entry>
 <entry><filename class="headerfile">ios</filename></entry>
-<entry><filename class="headerfile">iosfwd</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">iosfwd</filename></entry>
 <entry><filename class="headerfile">iostream</filename></entry>
 <entry><filename class="headerfile">istream</filename></entry>
 <entry><filename class="headerfile">iterator</filename></entry>
 <entry><filename class="headerfile">limits</filename></entry>
-<entry><filename class="headerfile">list</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">list</filename></entry>
 <entry><filename class="headerfile">locale</filename></entry>
 <entry><filename class="headerfile">map</filename></entry>
 <entry><filename class="headerfile">memory</filename></entry>
 <entry><filename class="headerfile">mutex</filename></entry>
-<entry><filename class="headerfile">new</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">new</filename></entry>
 <entry><filename class="headerfile">numeric</filename></entry>
 <entry><filename class="headerfile">ostream</filename></entry>
 <entry><filename class="headerfile">queue</filename></entry>
 <entry><filename class="headerfile">random</filename></entry>
-<entry><filename class="headerfile">ratio</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">ratio</filename></entry>
 <entry><filename class="headerfile">regex</filename></entry>
 <entry><filename class="headerfile">set</filename></entry>
 <entry><filename class="headerfile">sstream</filename></entry>
 <entry><filename class="headerfile">stack</filename></entry>
-<entry><filename class="headerfile">stdexcept</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">stdexcept</filename></entry>
 <entry><filename class="headerfile">streambuf</filename></entry>
 <entry><filename class="headerfile">string</filename></entry>
 <entry><filename class="headerfile">system_error</filename></entry>
 <entry><filename class="headerfile">thread</filename></entry>
-<entry><filename class="headerfile">tuple</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">tuple</filename></entry>
 <entry><filename class="headerfile">type_traits</filename></entry>
 <entry><filename class="headerfile">typeinfo</filename></entry>
 <entry><filename class="headerfile">unordered_map</filename></entry>
 <entry><filename class="headerfile">unordered_set</filename></entry>
-<entry><filename class="headerfile">utility</filename></entry>
 </row>
 <row>
+<entry><filename class="headerfile">utility</filename></entry>
 <entry><filename class="headerfile">valarray</filename></entry>
 <entry><filename class="headerfile">vector</filename></entry>
 </row>
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 <chrono>
 #include <condition_variable>
 #include <forward_list>
+#include <future>
 #include <mutex>
 #include <random>
 #include <ratio>
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 <exception>
 #include <cstdatomic>
 
-#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<typename _Result>
     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 <future>
 
-#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