Added inline for when_all() and when_any().

viboes · viboes · commit 08c4599fb684 · 2014-07-07T22:07:44.000+02:00
diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
@@ -4779,7 +4779,7 @@ namespace detail
   }
 
 //#if ! defined(BOOST_NO_CXX11_HDR_TUPLE)
-  BOOST_THREAD_FUTURE<csbl::tuple<> > when_all() {
+  inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_all() {
     return make_ready_future(csbl::tuple<>());
   }
 //#endif
@@ -4813,7 +4813,7 @@ namespace detail
   }
 
 //#if ! defined(BOOST_NO_CXX11_HDR_TUPLE)
-  BOOST_THREAD_FUTURE<csbl::tuple<> > when_any() {
+  inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_any() {
     return make_ready_future(csbl::tuple<>());
   }
 //#endif

Original file line number	Diff line number	Diff line change
`@@ -4779,7 +4779,7 @@ namespace detail`
`4779`	`4779`	`}`
`4780`	`4780`
`4781`	`4781`	`//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE)`
`4782`		`- BOOST_THREAD_FUTURE<csbl::tuple<> > when_all() {`
	`4782`	`+ inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_all() {`
`4783`	`4783`	`return make_ready_future(csbl::tuple<>());`
`4784`	`4784`	`}`
`4785`	`4785`	`//#endif`
`@@ -4813,7 +4813,7 @@ namespace detail`
`4813`	`4813`	`}`
`4814`	`4814`
`4815`	`4815`	`//#if ! defined(BOOST_NO_CXX11_HDR_TUPLE)`
`4816`		`- BOOST_THREAD_FUTURE<csbl::tuple<> > when_any() {`
	`4816`	`+ inline BOOST_THREAD_FUTURE<csbl::tuple<> > when_any() {`
`4817`	`4817`	`return make_ready_future(csbl::tuple<>());`
`4818`	`4818`	`}`
`4819`	`4819`	`//#endif`