Index: boost/test/impl/unit_test_parameters.ipp =================================================================== --- boost/test/impl/unit_test_parameters.ipp (revision 50508) +++ boost/test/impl/unit_test_parameters.ipp (working copy) @@ -30,12 +30,18 @@ // Boost.Runtime.Param #include #include -#include namespace rt = boost::runtime; namespace cla = rt::cla; + + +#ifndef UNDER_CE +#include + namespace env = rt::env; +#endif + // Boost #include #include @@ -214,7 +220,9 @@ boost::optional v; + #ifndef UNDER_CE env::get( parameter_2_env_var[parameter_name], v ); + #endif return v? *v : default_value; } Index: boost/test/utils/runtime/config.hpp =================================================================== --- boost/test/utils/runtime/config.hpp (revision 50508) +++ boost/test/utils/runtime/config.hpp (working copy) @@ -63,6 +63,7 @@ typedef std::basic_ostream out_stream; #endif +#ifndef UNDER_CE #if defined(__COMO__) inline void putenv_impl( cstring name, cstring value ) @@ -85,6 +86,7 @@ putenv( const_cast( fs.str().c_str() ) ); } #endif +#endif #define BOOST_RT_PARAM_LITERAL( l ) l #define BOOST_RT_PARAM_CSTRING_LITERAL( l ) cstring( l, sizeof( l ) - 1 ) @@ -103,6 +105,7 @@ typedef wrap_wstringstream format_stream; typedef std::wostream out_stream; +#ifndef UNDER_CE inline void putenv_impl( cstring name, cstring value ) { @@ -115,6 +118,7 @@ using namespace std; wputenv( const_cast( fs.str().c_str() ) ); } +#endif #define BOOST_RT_PARAM_LITERAL( l ) L ## l #define BOOST_RT_PARAM_CSTRING_LITERAL( l ) cstring( L ## l, sizeof( L ## l )/sizeof(wchar_t) - 1 ) Index: boost/test/utils/runtime/file/config_file_iterator.cpp =================================================================== --- boost/test/utils/runtime/file/config_file_iterator.cpp (revision 50508) +++ boost/test/utils/runtime/file/config_file_iterator.cpp (working copy) @@ -18,8 +18,11 @@ #include #include +#ifndef UNDER_CE #include +#endif + // Boost #include #include @@ -352,7 +355,9 @@ if( it == m_symbols_table.end() ) { boost::optional macro_value; // !! variable actually may have different type + #ifndef UNDER_CE env::get( macro_name, macro_value ); + #endif BOOST_RT_PARAM_VALIDATE_LOGIC( macro_value || ignore_missing || !m_detect_missing_macro, BOOST_RT_PARAM_LITERAL( "Unknown macro \"" ) << macro_name << BOOST_RT_PARAM_LITERAL( "\"" ) );