Changeset 209:768b76c5c087 in rrlib_serialization

Timestamp:

02.11.2021 15:58:04 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

17.03

Phase:

public

Tags:

tip

Message:

Makes rrlib_serialization compile without rrlib_xml

Files:

• detail/tStringOutputStreamFallback.cpp (modified) (1 diff)
• tests/serialization.cpp (modified) (3 diffs)

detail/tStringOutputStreamFallback.cpp

@@ -72 +72 @@
 // tStringOutputStreamFallback destructor
 //----------------------------------------------------------------------
+#ifdef _LIB_RRLIB_XML_PRESENT_
 tStringOutputStreamFallback::~tStringOutputStreamFallback()
 {
   wrapped.SetContent(ToString());
 }
+#endif
 
 //----------------------------------------------------------------------

tests/serialization.cpp

@@ -77 +77 @@
 // Const values
 //----------------------------------------------------------------------
+
+#ifdef _LIB_RRLIB_XML_PRESENT_
+const bool cXML_SUPPORT = true;
+#else
+const bool cXML_SUPPORT = false;
+#endif
 
 //----------------------------------------------------------------------
@@ -97 +103 @@
 static_assert(ContainerSerialization<std::pair<size_t, std::string>>::cBINARY_SERIALIZABLE, "Incorrect trait implementation");
 static_assert(IsBinarySerializable<std::map<size_t, std::string>>::value == true, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<std::map<size_t, std::string>>::value == true, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::map<size_t, std::string>>::value == cXML_SUPPORT, "Incorrect trait implementation");
 static_assert(IsAssociativeContainer<std::vector<std::string>>::value == false, "Incorrect trait implementation");
 static_assert(IsAssociativeContainer<std::vector<double>>::value == false, "Incorrect trait implementation");
@@ -123 +129 @@
 static_assert(IsBinarySerializable<std::tuple<int&, std::string&>>::value == true, "Incorrect trait implementation");
 
-static_assert(IsXMLSerializable<std::tuple<>>::value == true, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<std::tuple<int, std::array<std::string, 4>, std::vector<tEnumSigned>>>::value == true, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::tuple<>>::value == cXML_SUPPORT, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::tuple<int, std::array<std::string, 4>, std::vector<tEnumSigned>>>::value == cXML_SUPPORT, "Incorrect trait implementation");
 static_assert(IsXMLSerializable<std::tuple<tNonSerializable, std::array<tNonSerializable, 4>>>::value == false, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<std::tuple<std::map<int, int>, std::array<std::string, 4>>>::value == true, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<std::pair<int, std::array<std::string, 4>>>::value == true, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::tuple<std::map<int, int>, std::array<std::string, 4>>>::value == cXML_SUPPORT, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::pair<int, std::array<std::string, 4>>>::value == cXML_SUPPORT, "Incorrect trait implementation");
 static_assert(IsXMLSerializable<std::pair<tNonSerializable, std::array<tNonSerializable, 4>>>::value == false, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<int&>::value == true, "Incorrect trait implementation");
-static_assert(IsXMLSerializable<std::tuple<int&, std::string&>>::value == true, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<int&>::value == cXML_SUPPORT, "Incorrect trait implementation");
+static_assert(IsXMLSerializable<std::tuple<int&, std::string&>>::value == cXML_SUPPORT, "Incorrect trait implementation");