import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / asio / test / unit_test.hpp

diff --git a/ceph/src/boost/libs/asio/test/unit_test.hpp b/ceph/src/boost/libs/asio/test/unit_test.hpp
index 6d5a7847831a326a4e393e31684f9c76d4f0d317..de1f55d51db3551755fc3848eb9d1929c92fe987 100644 (file)
--- a/ceph/src/boost/libs/asio/test/unit_test.hpp
+++ b/ceph/src/boost/libs/asio/test/unit_test.hpp
@@ -19,7 +19,7 @@
 # include <stdlib.h> // Needed for lrand48.
 #endif // defined(__sun)
 
-#if defined(__BORLANDC__)
+#if defined(__BORLANDC__) && !defined(__clang__)
 
 // Prevent use of intrinsic for strcmp.
 # include <cstring>
@@ -28,7 +28,7 @@
 // Suppress error about condition always being true.
 # pragma option -w-ccc
 
-#endif // defined(__BORLANDC__)
+#endif // defined(__BORLANDC__) && !defined(__clang__)
 
 #if defined(BOOST_ASIO_MSVC)
 # pragma warning (disable:4127)
@@ -154,6 +154,21 @@ void throw_exception(const T& t)
 #define BOOST_ASIO_TEST_CASE(test) \
   boost::asio::detail::run_test<&test>(#test);
 
+#define BOOST_ASIO_TEST_CASE2(test1, test2) \
+  boost::asio::detail::run_test<&test1, test2>(#test1 "," #test2);
+
+#define BOOST_ASIO_TEST_CASE3(test1, test2, test3) \
+  boost::asio::detail::run_test<&test1, test2, test3>( \
+    #test1 "," #test2 "," #test3);
+
+#define BOOST_ASIO_TEST_CASE4(test1, test2, test3, test4) \
+  boost::asio::detail::run_test<&test1, test2, test3, test4>( \
+    #test1 "," #test2 "," #test3 "," #test4);
+
+#define BOOST_ASIO_TEST_CASE5(test1, test2, test3, test4, test5) \
+  boost::asio::detail::run_test<&test1, test2, test3, test4, test5>( \
+    #test1 "," #test2 "," #test3 "," #test4 "," #test5);
+
 #define BOOST_ASIO_COMPILE_TEST_CASE(test) \
   boost::asio::detail::compile_test<&test>(#test);