Moving mpl_tools.h to module 'Algorithm'

matthiasrichter · matthiasrichter · commit d360c4b7397a · 2018-04-17T09:08:04.000+02:00
diff --git a/Algorithm/CMakeLists.txt b/Algorithm/CMakeLists.txt
@@ -43,6 +43,7 @@ set(TEST_SRCS
   test/parser.cxx
   test/tableview.cxx
   test/pageparser.cxx
+  test/test_mpl_tools.cxx
 )
 
 O2_GENERATE_TESTS(
diff --git a/Algorithm/include/Algorithm/mpl_tools.h b/Algorithm/include/Algorithm/mpl_tools.h
diff --git a/Algorithm/test/test_mpl_tools.cxx b/Algorithm/test/test_mpl_tools.cxx
@@ -17,8 +17,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include "../include/DataCompression/dc_primitives.h"
-#include "../include/DataCompression/mpl_tools.h"
+#include "../include/Algorithm/mpl_tools.h"
 #include <boost/mpl/size.hpp>
 #include <boost/type.hpp>
 #include <boost/mpl/range_c.hpp>
@@ -28,11 +27,17 @@
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/mpl/lambda.hpp>
+#include <boost/mpl/string.hpp> // see note below
 #include <iostream>
 #include <iomanip>
 #include <vector>
 #include <type_traits>
 
+// FIXME: mpl/string.hpp required to be included to avoid compilation error
+// error: no matching function for call to ‘assertion_failed ...' in the mpl::for_each
+// implementation (BOOST_MPL_ASSERT check). Not fully understood as simply including
+// mpl/assert.hpp does not help. Maybe it's an inconssitency in the do_typewrap meta
+// program
 namespace bmpl = boost::mpl;
 
 // defining a list of known data types
diff --git a/Utilities/DataCompression/CMakeLists.txt b/Utilities/DataCompression/CMakeLists.txt
@@ -37,7 +37,6 @@ EndForEach (_file RANGE 0 ${_length})
 endif()
 
 set(TEST_SRCS
-  test/test_mpl_tools.cxx
   test/test_dc_primitives.cxx
   test/test_Fifo.cxx
   test/test_DataGenerator.cxx
diff --git a/cmake/O2Dependencies.cmake b/cmake/O2Dependencies.cmake
@@ -1364,6 +1364,7 @@ o2_define_bucket(
 
     DEPENDENCIES
     Headers
+    common_boost_bucket
 
     INCLUDE_DIRECTORIES
 )

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ set(TEST_SRCS`
`43`	`43`	`test/parser.cxx`
`44`	`44`	`test/tableview.cxx`
`45`	`45`	`test/pageparser.cxx`
	`46`	`+ test/test_mpl_tools.cxx`
`46`	`47`	`)`
`47`	`48`
`48`	`49`	`O2_GENERATE_TESTS(`
Original file line number	Diff line number	Diff line change
`@@ -1364,6 +1364,7 @@ o2_define_bucket(`
`1364`	`1364`
`1365`	`1365`	`DEPENDENCIES`
`1366`	`1366`	`Headers`
	`1367`	`+ common_boost_bucket`
`1367`	`1368`
`1368`	`1369`	`INCLUDE_DIRECTORIES`
`1369`	`1370`	`)`