[Boost-commit] svn:boost r50475 - in trunk/boost/test: impl utils/runtime utils/runtime/cla utils/runtime/env

Subject: [Boost-commit] svn:boost r50475 - in trunk/boost/test: impl utils/runtime utils/runtime/cla utils/runtime/env
From: gennadiy.rozental_at_[hidden]
Date: 2009-01-05 04:04:03

Author: rogeeff
Date: 2009-01-05 04:04:01 EST (Mon, 05 Jan 2009)
New Revision: 50475
URL: http://svn.boost.org/trac/boost/changeset/50475

Log:
some Borland workarounds
Text files modified: 
   trunk/boost/test/impl/unit_test_parameters.ipp  |     4 +++-                                    
   trunk/boost/test/utils/runtime/cla/parser.ipp   |     4 ++--                                    
   trunk/boost/test/utils/runtime/config.hpp       |     2 +-                                      
   trunk/boost/test/utils/runtime/env/variable.hpp |     6 ++++++                                  
   4 files changed, 12 insertions(+), 4 deletions(-)

Modified: trunk/boost/test/impl/unit_test_parameters.ipp
==============================================================================
--- trunk/boost/test/impl/unit_test_parameters.ipp	(original)
+++ trunk/boost/test/impl/unit_test_parameters.ipp	2009-01-05 04:04:01 EST (Mon, 05 Jan 2009)
@@ -226,11 +226,13 @@
 void
 init( int& argc, char** argv )
 {
+    using namespace cla;
+
     try {
         s_cla_parser - cla::ignore_mismatch
           << cla::dual_name_parameter<bool>( AUTO_START_DBG + "|d" )
             - (cla::prefix = "--|-",cla::separator = "=| ",cla::guess_name,cla::optional,
-               cla::description = "Automatically starts debugger if system level error (signal) occurs" )
+               cla::description = "Automatically starts debugger if system level error (signal) occurs")
           << cla::named_parameter<std::string>( BREAK_EXEC_PATH )
             - (cla::prefix = "--",cla::separator = "=",cla::guess_name,cla::optional,
                cla::description = "For the exception safety testing allows to break at specific execution path")

Modified: trunk/boost/test/utils/runtime/cla/parser.ipp
==============================================================================
--- trunk/boost/test/utils/runtime/cla/parser.ipp	(original)
+++ trunk/boost/test/utils/runtime/cla/parser.ipp	2009-01-05 04:04:01 EST (Mon, 05 Jan 2009)
@@ -102,7 +102,7 @@
         m_program_name.assign( argv[0] );
         dstring::size_type pos = m_program_name.find_last_of( BOOST_RT_PARAM_LITERAL( "/\\" ) );
 
-        if( pos != cstring::npos )
+        if( pos != (dstring::size_type)cstring::npos )
             m_program_name.erase( 0, pos+1 );
     }
 
@@ -175,7 +175,7 @@
         }
     }
 
-    return found_param ? found_param->actual_argument() : const_argument_ptr();
+    return found_param ? found_param->actual_argument() : argument_ptr();
 }
 
 //____________________________________________________________________________//

Modified: trunk/boost/test/utils/runtime/config.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/config.hpp	(original)
+++ trunk/boost/test/utils/runtime/config.hpp	2009-01-05 04:04:01 EST (Mon, 05 Jan 2009)
@@ -89,7 +89,7 @@
 #define BOOST_RT_PARAM_LITERAL( l ) l
 #define BOOST_RT_PARAM_CSTRING_LITERAL( l ) cstring( l, sizeof( l ) - 1 )
 #define BOOST_RT_PARAM_GETENV getenv
-#define BOOST_RT_PARAM_PUTENV putenv_impl
+#define BOOST_RT_PARAM_PUTENV ::boost::BOOST_RT_PARAM_NAMESPACE::putenv_impl
 #define BOOST_RT_PARAM_EXCEPTION_INHERIT_STD
 
 //____________________________________________________________________________//

Modified: trunk/boost/test/utils/runtime/env/variable.hpp
==============================================================================
--- trunk/boost/test/utils/runtime/env/variable.hpp	(original)
+++ trunk/boost/test/utils/runtime/env/variable.hpp	2009-01-05 04:04:01 EST (Mon, 05 Jan 2009)
@@ -100,7 +100,13 @@
     // access methods
     T const&    value() const                               { return variable_base::value<T>(); }
 
+#if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206)) || \
+    BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0593))
+    template<typename T>
+    void        value( boost::optional<T>& res ) const      { variable_base::value( res ); }
+#else
     using       variable_base::value;
+#endif
 
     // Value assignment
     template<typename V>