Tests/Unit/GUI/TestMultiLayerItem.cpp

@@ -33,8 +33,8 @@ TEST_F(TestMultiLayerItem, test_twoLayerSystem)
     EXPECT_TRUE(bottom->roughnessItem()->isEnabled());
 
     // Default roughness should be "LayerZeroRoughness"
-    EXPECT_EQ(top->roughness()->modelType(), LayerZeroRoughnessItem::M_TYPE);
-    EXPECT_EQ(bottom->roughness()->modelType(), LayerZeroRoughnessItem::M_TYPE);
+    EXPECT_TRUE(std::holds_alternative<LayerZeroRoughnessItem*>(top->roughness().currentItem()));
+    EXPECT_TRUE(std::holds_alternative<LayerZeroRoughnessItem*>(bottom->roughness().currentItem()));
 }
 
 //! Testing layer appearance (enabled, disabled) in a MultiLayer made of three default layers.
@@ -66,9 +66,9 @@ TEST_F(TestMultiLayerItem, test_threeLayerSystem)
     EXPECT_TRUE(bottom->roughnessItem()->isEnabled());
 
     // Default roughness should be "LayerZeroRoughness"
-    EXPECT_EQ(top->roughness()->modelType(), LayerZeroRoughnessItem::M_TYPE);
-    EXPECT_EQ(middle->roughness()->modelType(), LayerZeroRoughnessItem::M_TYPE);
-    EXPECT_EQ(bottom->roughness()->modelType(), LayerZeroRoughnessItem::M_TYPE);
+    EXPECT_TRUE(std::holds_alternative<LayerZeroRoughnessItem*>(top->roughness().currentItem()));
+    EXPECT_TRUE(std::holds_alternative<LayerZeroRoughnessItem*>(middle->roughness().currentItem()));
+    EXPECT_TRUE(std::holds_alternative<LayerZeroRoughnessItem*>(bottom->roughness().currentItem()));
 }
 
 //! Testing middle layer appearance when it is moved to the top.

cmake/BornAgain/Dependences.cmake

@@ -55,6 +55,8 @@ set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 add_definitions(-DBOOST_ALL_DYN_LINK) # line is needed for MSVC
 add_definitions(-DBOOST_UUID_FORCE_AUTO_LINK) # line is needed to link bcrypt for MSVC
+# amends problems with bimap and MSVC, serialization of bimap is currently not needed
+add_definitions(-DBOOST_BIMAP_DISABLE_SERIALIZATION)
 
 # Boost component libraries (do not list headers here)
 set(boost_libraries_required iostreams program_options)