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