import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / system / test / error_code_test.cpp

diff --git a/ceph/src/boost/libs/system/test/error_code_test.cpp b/ceph/src/boost/libs/system/test/error_code_test.cpp
index 7965541baafe0a10dcf8fae219286132301fc81b..e77e8cefae228d9f55d47ea89d5a8ca928a469c0 100644 (file)
--- a/ceph/src/boost/libs/system/test/error_code_test.cpp
+++ b/ceph/src/boost/libs/system/test/error_code_test.cpp
@@ -123,17 +123,7 @@ int main( int, char ** )
   BOOST_TEST( generic_category() != system_category() );
   BOOST_TEST( system_category() != generic_category() );
 
-  if ( std::less<const error_category*>()( &generic_category(), &system_category() ) )
-  {
-    BOOST_TEST( generic_category() < system_category() );
-    BOOST_TEST( !(system_category() < generic_category()) );
-  }
-  else
-  {
-    BOOST_TEST( system_category() < generic_category() );
-    BOOST_TEST( !(generic_category() < system_category()) );
-  }
-
+  BOOST_TEST_NE( generic_category() < system_category(), system_category() < generic_category() );
 
   error_code ec;
   error_condition econd;
@@ -207,7 +197,8 @@ int main( int, char ** )
 #if defined(BOOST_WINDOWS_API)
   // Borland appends newline, so just check text
   BOOST_TEST( ec.message().substr(0,13) == "Unknown error" );
-  BOOST_TEST( ec_0_system.message().substr(0,36) == "The operation completed successfully" );
+  // Fails when the language isn't US English
+  // BOOST_TEST( ec_0_system.message().substr(0,36) == "The operation completed successfully" );
 #elif  defined(linux) || defined(__linux) || defined(__linux__)
   // Linux appends value to message as unsigned, so it varies with # of bits
   BOOST_TEST( ec.message().substr(0,13) == "Unknown error" );