airrac/0001-Fix-for-Boost-1.59.0-c...

39 lines
1.3 KiB
Diff

From dfb3407046ce37c1f4516d615c65eca94b680048 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 30 Aug 2015 01:04:37 +0100
Subject: [PATCH] Fix for Boost 1.59.0 compatibility.
Boost.Test has major changes in 1.59.0 including renaming the
XML enumerator to OF_XML.
---
test/airrac/YieldTestSuite.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/test/airrac/YieldTestSuite.cpp b/test/airrac/YieldTestSuite.cpp
index a0151e5..d08d35a 100644
--- a/test/airrac/YieldTestSuite.cpp
+++ b/test/airrac/YieldTestSuite.cpp
@@ -14,6 +14,7 @@
#define BOOST_TEST_MAIN
#define BOOST_TEST_MODULE YieldTestSuite
#include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
// StdAir
#include <stdair/basic/BasLogParams.hpp>
#include <stdair/basic/BasDBParams.hpp>
@@ -36,7 +37,11 @@ struct UnitTestConfig {
/** Constructor. */
UnitTestConfig() {
boost_utf::unit_test_log.set_stream (utfReportStream);
+#if BOOST_VERSION >= 105900
+ boost_utf::unit_test_log.set_format (boost_utf::OF_XML);
+#else
boost_utf::unit_test_log.set_format (boost_utf::XML);
+#endif
boost_utf::unit_test_log.set_threshold_level (boost_utf::log_test_units);
//boost_utf::unit_test_log.set_threshold_level (boost_utf::log_successful_tests);
}
--
2.4.3