From e68f53c48b72a9ed86d35bb9b3c5d64e1b228b90 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 30 Aug 2015 01:55:09 +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/rmol/ForecasterTestSuite.cpp    | 5 +++++
 test/rmol/OptimiseTestSuite.cpp      | 5 +++++
 test/rmol/UnconstrainerTestSuite.cpp | 5 +++++
 test/rmol/bomsforforecaster.cpp      | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/test/rmol/ForecasterTestSuite.cpp b/test/rmol/ForecasterTestSuite.cpp
index 665571e..6d8cdf7 100644
--- a/test/rmol/ForecasterTestSuite.cpp
+++ b/test/rmol/ForecasterTestSuite.cpp
@@ -16,6 +16,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE ForecasterTestSuite
 #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);
   }
diff --git a/test/rmol/OptimiseTestSuite.cpp b/test/rmol/OptimiseTestSuite.cpp
index 3919f7a..b9851c2 100644
--- a/test/rmol/OptimiseTestSuite.cpp
+++ b/test/rmol/OptimiseTestSuite.cpp
@@ -14,6 +14,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE OptimiseTestSuite
 #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);
   }
diff --git a/test/rmol/UnconstrainerTestSuite.cpp b/test/rmol/UnconstrainerTestSuite.cpp
index 846cbfc..a9cc4a9 100644
--- a/test/rmol/UnconstrainerTestSuite.cpp
+++ b/test/rmol/UnconstrainerTestSuite.cpp
@@ -14,6 +14,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE UnconstrainerTestSuite
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
 // StdAir
 #include <stdair/basic/BasLogParams.hpp>
 #include <stdair/basic/BasDBParams.hpp>
@@ -34,7 +35,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);
   }
diff --git a/test/rmol/bomsforforecaster.cpp b/test/rmol/bomsforforecaster.cpp
index 48b34a9..b900412 100644
--- a/test/rmol/bomsforforecaster.cpp
+++ b/test/rmol/bomsforforecaster.cpp
@@ -16,6 +16,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE OptimiseTestSuite
 #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