import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / uuid / test / test_name_generator.cpp

diff --git a/ceph/src/boost/libs/uuid/test/test_name_generator.cpp b/ceph/src/boost/libs/uuid/test/test_name_generator.cpp
index fdf5c349a4444812474e3d5070cf0e007416ccc6..18223b7e1b992e604e2b4494faae9caaf6f33d67 100644 (file)
--- a/ceph/src/boost/libs/uuid/test/test_name_generator.cpp
+++ b/ceph/src/boost/libs/uuid/test/test_name_generator.cpp
@@ -5,7 +5,7 @@
 
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
+// https://www.boost.org/LICENSE_1_0.txt)
 
 //  libs/uuid/test/test_name_generator.cpp  -------------------------------//
 
@@ -34,7 +34,18 @@ int main(int, char*[])
 
     uuid correct_sha1  = {{0x21, 0xf7, 0xf8, 0xde, 0x80, 0x51, 0x5b, 0x89, 0x86, 0x80, 0x01, 0x95, 0xef, 0x79, 0x8b, 0x6a}};
     uuid wcorrect_sha1 = {{0xc3, 0x15, 0x27, 0x0b, 0xa4, 0x66, 0x58, 0x72, 0xac, 0xa4, 0x96, 0x26, 0xce, 0xc0, 0xf4, 0xbe}};
+#if !defined(BOOST_UUID_COMPAT_PRE_1_71_MD5)
+    // this value is stable across all endian systems
+    uuid correct_md5   = {{0x06, 0x20, 0x5c, 0xec, 0x25, 0x5b, 0x30, 0x0e, 0xa8, 0xbc, 0xa8, 0x60, 0x5a, 0xb8, 0x24, 0x4e}};
+#else
+    // code before 1.71 had different results depending on the endianness
+# if BOOST_ENDIAN_LITTLE_BYTE
     uuid correct_md5   = {{0xec, 0x5c, 0x20, 0x06, 0x0e, 0x00, 0x3b, 0x25, 0xa0, 0xa8, 0xbc, 0xe8, 0x4e, 0x24, 0xb8, 0x5a}};
+# else
+    uuid correct_md5   = {{0x06, 0x20, 0x5c, 0xec, 0x25, 0x5b, 0x30, 0x0e, 0xa8, 0xbc, 0xa8, 0x60, 0x5a, 0xb8, 0x24, 0x4e}};
+# endif
+#endif
+
 
     name_generator_sha1 gen(ns::dns());