From 5d407b561cbf173cd8b0b12ec3615c6dbac0bcba Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 30 Aug 2015 02:39:34 +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/sequential_generation/RandomDistributionTestSuite.cpp | 5 +++++
 test/sequential_generation/SimulateTestSuite.cpp           | 5 +++++
 test/trademgen/DemandGenerationTestSuite.cpp               | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/test/sequential_generation/RandomDistributionTestSuite.cpp b/test/sequential_generation/RandomDistributionTestSuite.cpp
index be3c87e..ff06d60 100644
--- a/test/sequential_generation/RandomDistributionTestSuite.cpp
+++ b/test/sequential_generation/RandomDistributionTestSuite.cpp
@@ -23,6 +23,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE RandomDistributionTest
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
 
 // using namespace boost;
 namespace ba = boost::accumulators;
@@ -38,7 +39,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/sequential_generation/SimulateTestSuite.cpp b/test/sequential_generation/SimulateTestSuite.cpp
index d5a902f..0904945 100644
--- a/test/sequential_generation/SimulateTestSuite.cpp
+++ b/test/sequential_generation/SimulateTestSuite.cpp
@@ -19,6 +19,7 @@
 // Boost Unit Test Framework (UTF)
 #define BOOST_TEST_MODULE TraDemGenTest
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
 
 // using namespace boost;
 namespace ba = boost::accumulators;
@@ -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/trademgen/DemandGenerationTestSuite.cpp b/test/trademgen/DemandGenerationTestSuite.cpp
index e156c59..57203b4 100644
--- a/test/trademgen/DemandGenerationTestSuite.cpp
+++ b/test/trademgen/DemandGenerationTestSuite.cpp
@@ -15,6 +15,7 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE DemandGenerationTest
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
 // StdAir
 #include <stdair/stdair_basic_types.hpp>
 #include <stdair/basic/BasConst_General.hpp>
@@ -43,7 +44,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