Jonathan Wakely 7f11a7
--- boost_1_63_0/boost/test/impl/unit_test_parameters.ipp.orig	2017-08-09 18:45:45.223055629 +0100
Jonathan Wakely 7f11a7
+++ boost_1_63_0/boost/test/impl/unit_test_parameters.ipp	2017-08-09 18:45:48.815050508 +0100
Jonathan Wakely 7f11a7
@@ -99,7 +99,7 @@
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
 std::string HELP              = "help";
Jonathan Wakely 7f11a7
 std::string USAGE             = "usage";
Jonathan Wakely 7f11a7
-std::string VERSION           = "version";
Jonathan Wakely 7f11a7
+std::string btrt_VERSION           = "version";
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
 //____________________________________________________________________________//
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
@@ -638,10 +638,10 @@
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
     ///////////////////////////////////////////////
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
-    rt::option version( VERSION, (
Jonathan Wakely 7f11a7
+    rt::option version( btrt_VERSION, (
Jonathan Wakely 7f11a7
         rt::description = "Prints Boost.Test version and exits."
Jonathan Wakely 7f11a7
     ));
Jonathan Wakely 7f11a7
-    version.add_cla_id( "--", VERSION, " " );
Jonathan Wakely 7f11a7
+    version.add_cla_id( "--", btrt_VERSION, " " );
Jonathan Wakely 7f11a7
     store.add( version );
Jonathan Wakely 7f11a7
 }
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
@@ -676,7 +676,7 @@
Jonathan Wakely 7f11a7
         rt::finalize_arguments( s_parameters_store, s_arguments_store );
Jonathan Wakely 7f11a7
 
Jonathan Wakely 7f11a7
         // Report help if requested
Jonathan Wakely 7f11a7
-        if( runtime_config::get<bool>( VERSION ) ) {
Jonathan Wakely 7f11a7
+        if( runtime_config::get<bool>( btrt_VERSION ) ) {
Jonathan Wakely 7f11a7
             parser->version( std::cerr );
Jonathan Wakely 7f11a7
             BOOST_TEST_I_THROW( framework::nothing_to_test( boost::exit_success ) );
Jonathan Wakely 7f11a7
         }