update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / dll / test / cpp_import_class_test.cpp

diff --git a/ceph/src/boost/libs/dll/test/cpp_import_class_test.cpp b/ceph/src/boost/libs/dll/test/cpp_import_class_test.cpp
index 2b4e00913ce81fed264f57631f4862e41e541ced..60e0adc0b246b4ac8c7706aa2f236350ed7fbab8 100644 (file)
--- a/ceph/src/boost/libs/dll/test/cpp_import_class_test.cpp
+++ b/ceph/src/boost/libs/dll/test/cpp_import_class_test.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
     std::size_t type_size = *import_mangled<std::size_t>(sm, "some_space::size_of_some_class");
     {
 
-#if defined(BOOST_MSVC) || defined(BOOST_MSVC_FULL_VER)
+#if defined(_MSC_VER) // MSVC, Clang-cl, and ICC on Windows
        class override_class{};
        auto cl = import_class<override_class, int>(sm, "some_space::some_class", type_size, 42);
 #else
@@ -97,7 +97,7 @@ int main(int argc, char* argv[])
 
         const std::type_info & ti = cl.get_type_info();
         std::string imp_name = boost::core::demangle(ti.name());
-#if defined(BOOST_MSVC) || defined(BOOST_MSVC_FULL_VER)
+#if defined(_MSC_VER) // MSVC, Clang-cl, and ICC on Windows
         std::string exp_name = "struct some_space::some_class";
 #else
         std::string exp_name = "some_space::some_class";