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