import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / thread / test / sync / futures / shared_future / get_pass.cpp

diff --git a/ceph/src/boost/libs/thread/test/sync/futures/shared_future/get_pass.cpp b/ceph/src/boost/libs/thread/test/sync/futures/shared_future/get_pass.cpp
index 558fb024f776dd235f2aac24e9e03f6619fe8463..067a70b2a818b4463f19baf299952c2dbc3686ec 100644 (file)
--- a/ceph/src/boost/libs/thread/test/sync/futures/shared_future/get_pass.cpp
+++ b/ceph/src/boost/libs/thread/test/sync/futures/shared_future/get_pass.cpp
@@ -28,8 +28,6 @@
 
 #if defined BOOST_THREAD_USES_CHRONO
 
-namespace boost
-{
 template <typename T>
 struct wrap
 {
@@ -39,9 +37,8 @@ struct wrap
 };
 
 template <typename T>
-exception_ptr make_exception_ptr(T v) {
-  return copy_exception(wrap<T>(v));
-}
+boost::exception_ptr make_exception_ptr(T v) {
+  return boost::copy_exception(wrap<T>(v));
 }
 
 void func1(boost::promise<int> p)
@@ -53,7 +50,7 @@ void func1(boost::promise<int> p)
 void func2(boost::promise<int> p)
 {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
-    p.set_exception(boost::make_exception_ptr(3));
+    p.set_exception(::make_exception_ptr(3));
 }
 
 int j = 0;
@@ -68,7 +65,7 @@ void func3(boost::promise<int&> p)
 void func4(boost::promise<int&> p)
 {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
-    p.set_exception(boost::make_exception_ptr(3.5));
+    p.set_exception(::make_exception_ptr(3.5));
 }
 
 void func5(boost::promise<void> p)
@@ -80,7 +77,7 @@ void func5(boost::promise<void> p)
 void func6(boost::promise<void> p)
 {
     boost::this_thread::sleep_for(boost::chrono::milliseconds(500));
-    p.set_exception(boost::make_exception_ptr(4));
+    p.set_exception(::make_exception_ptr(4));
 }
 
 
@@ -106,7 +103,7 @@ int main()
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
           boost::thread(func2, boost::move(p)).detach();
 #else
-          p.set_exception(boost::make_exception_ptr(3));
+          p.set_exception(::make_exception_ptr(3));
 #endif
           try
           {
@@ -114,7 +111,7 @@ int main()
               BOOST_TEST(f.get() == 3);
               BOOST_TEST(false);
           }
-          catch (boost::wrap<int> const& i)
+          catch (::wrap<int> const& i)
           {
               BOOST_TEST(i.value == 3);
           }
@@ -146,7 +143,7 @@ int main()
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
           boost::thread(func4, boost::move(p)).detach();
 #else
-          p.set_exception(boost::make_exception_ptr(3.5));
+          p.set_exception(::make_exception_ptr(3.5));
 #endif
           try
           {
@@ -154,7 +151,7 @@ int main()
               BOOST_TEST(f.get() == 3);
               BOOST_TEST(false);
           }
-          catch (boost::wrap<double> const& i)
+          catch (::wrap<double> const& i)
           {
               BOOST_TEST(i.value == 3.5);
           }
@@ -181,7 +178,7 @@ int main()
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
       boost::thread(func6, boost::move(p)).detach();
 #else
-      p.set_exception(boost::make_exception_ptr(4));
+      p.set_exception(::make_exception_ptr(4));
 #endif
       try
       {
@@ -189,7 +186,7 @@ int main()
           f.get();
           BOOST_TEST(false);
       }
-      catch (boost::wrap<int> const& i)
+      catch (::wrap<int> const& i)
       {
           BOOST_TEST(i.value == 4);
       }