update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / libs / format / test / format_test_enum.cpp

diff --git a/ceph/src/boost/libs/format/test/format_test_enum.cpp b/ceph/src/boost/libs/format/test/format_test_enum.cpp
index 80a9c358d9ee1fdcb8af934014c39e24e1a093ae..ac4a4e8ed665a6df2029cb9c92dc0f64e6640054 100644 (file)
--- a/ceph/src/boost/libs/format/test/format_test_enum.cpp
+++ b/ceph/src/boost/libs/format/test/format_test_enum.cpp
@@ -12,10 +12,8 @@
 
 // ------------------------------------------------------------------------------
 
-#include "boost/format.hpp"
-
-#define BOOST_INCLUDE_MAIN 
-#include <boost/test/test_tools.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <boost/format.hpp>
 
 enum enum_plain { PLAIN };
 enum { ANONYMOUS };
@@ -32,14 +30,14 @@ std::ostream& operator<<(std::ostream& os, enum_overloaded_typedef) {
     return(os);
 }
 
-int test_main(int, char*[]) {
+int main(int, char*[]) {
     // in this case, we should implicitly convert to int
-    BOOST_CHECK_EQUAL((boost::format("%d") % PLAIN).str(), "0");
-    BOOST_CHECK_EQUAL((boost::format("%d") % ANONYMOUS).str(), "0");
+    BOOST_TEST_EQ((boost::format("%d") % PLAIN).str(), "0");
+    BOOST_TEST_EQ((boost::format("%d") % ANONYMOUS).str(), "0");
 
     // but here we need to use the overloaded operator
-    BOOST_CHECK_EQUAL((boost::format("%s") % OVERLOADED).str(), "overloaded");
-    BOOST_CHECK_EQUAL((boost::format("%s") % OVERLOADED_TYPEDEF).str(), "overloaded");
+    BOOST_TEST_EQ((boost::format("%s") % OVERLOADED).str(), "overloaded");
+    BOOST_TEST_EQ((boost::format("%s") % OVERLOADED_TYPEDEF).str(), "overloaded");
 
-    return 0;
+    return boost::report_errors();
 }