[FIX] boost

OpenMS · Nov 13, 2017 · 4902204 · 4902204
1 parent 49d5079
commit 4902204
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/openms/source/FILTERING/NOISEESTIMATION/SignalToNoiseEstimatorMedianRapid.cpp b/src/openms/source/FILTERING/NOISEESTIMATION/SignalToNoiseEstimatorMedianRapid.cpp
@@ -37,6 +37,11 @@
 #include <algorithm>
 #include <numeric>
 
+// array_wrapper needs to be included before it is used
+// only in boost1.64+. See issue #2790
+#if OPENMS_BOOST_VERSION_MINOR >= 64
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics/stats.hpp>
 #include <boost/accumulators/statistics/mean.hpp>

diff --git a/src/tests/class_tests/openms/source/UniqueIdGenerator_test.cpp b/src/tests/class_tests/openms/source/UniqueIdGenerator_test.cpp
@@ -39,6 +39,11 @@
 #include <OpenMS/CONCEPT/UniqueIdGenerator.h>
 #include <ctime>
 #include <algorithm> // for std::sort and std::adjacent_find
+// array_wrapper needs to be included before it is used
+// only in boost1.64+. See issue #2790
+#if OPENMS_BOOST_VERSION_MINOR >= 64
+#include <boost/serialization/array_wrapper.hpp>
+#endif
 #include <boost/accumulators/statistics/covariance.hpp>
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
 ///////////////////////////