Changeset 912a6f

Timestamp:

Jun 25, 2020, 3:24:41 PM (5 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

1ca493a

Parents:

7a434f

git-author:

Frederik Heber <frederik.heber@…> (04/22/19 22:58:30)

git-committer:

Frederik Heber <frederik.heber@…> (06/25/20 15:24:41)

Message:

Adapted to boost 1.64.

• need array_wrapper.hpp when using make_array. Otherwise make_array cannot be found.
• unit_test has an issue with ::get.

Files:

• ThirdParty/LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp (modified) (1 diff)
• ThirdParty/LinearAlgebra/src/LinearAlgebra/VectorContent.hpp (modified) (1 diff)
• ThirdParty/vmg/test/unit_test/boost_test.cpp (modified) (1 diff)
• src/Element/element.hpp (modified) (1 diff)
• src/Element/periodentafel.hpp (modified) (1 diff)

ThirdParty/LinearAlgebra/src/LinearAlgebra/MatrixContent.hpp

@@ -16 +16 @@
 #include "CodePatterns/Assert.hpp"
 
+#include <boost/version.hpp>
+#if BOOST_VERSION > 106300
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/split_member.hpp>

ThirdParty/LinearAlgebra/src/LinearAlgebra/VectorContent.hpp

@@ -16 +16 @@
 #include "CodePatterns/Assert.hpp"
 
+#include <boost/version.hpp>
+#if BOOST_VERSION > 106300
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/split_member.hpp>

ThirdParty/vmg/test/unit_test/boost_test.cpp

@@ -37 +37 @@
 
 #include <boost/test/framework.hpp>
-#include <boost/test/detail/unit_test_parameters.hpp>
-#include <boost/test/impl/unit_test_main.ipp>
+//#include <boost/test/detail/unit_test_parameters.hpp>
+//#include <boost/test/impl/unit_test_main.ipp>
 
 #ifdef BOOST_TEST_ALTERNATIVE_INIT_API

src/Element/element.hpp

@@ -21 +21 @@
 #include "types.hpp"
 
+#include <boost/version.hpp>
+#if BOOST_VERSION > 106300
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include "boost/serialization/array.hpp"
 #include "boost/serialization/string.hpp"

src/Element/periodentafel.hpp

@@ -16 +16 @@
 #include "types.hpp"
 
+#include <boost/version.hpp>
+#if BOOST_VERSION > 106300
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include "boost/serialization/array.hpp"
 #include "boost/serialization/map.hpp"