From: gennadiy.rozental_at_[hidden]
Date: 2007-10-24 00:48:18
Author: rogeeff
Date: 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
New Revision: 40396
URL: http://svn.boost.org/trac/boost/changeset/40396
Log:
win CE and solaris workarounds
Text files modified:
trunk/boost/test/framework.hpp | 10 ------
trunk/boost/test/impl/execution_monitor.ipp | 17 ++++++-----
trunk/boost/test/impl/test_tools.ipp | 2 -
trunk/boost/test/impl/unit_test_suite.ipp | 4 --
trunk/boost/test/test_tools.hpp | 8 -----
trunk/boost/test/utils/basic_cstring/basic_cstring.hpp | 4 --
trunk/boost/test/utils/fixed_mapping.hpp | 5 --
trunk/boost/test/utils/foreach.hpp | 56 ----------------------------------------
trunk/boost/test/utils/named_params.hpp | 25 -----------------
9 files changed, 11 insertions(+), 120 deletions(-)
Modified: trunk/boost/test/framework.hpp
==============================================================================
--- trunk/boost/test/framework.hpp (original)
+++ trunk/boost/test/framework.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -63,21 +63,13 @@
// constant access methods
BOOST_TEST_DECL test_case const& current_test_case();
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
-template<typename UnitType>
-UnitType& get( test_unit_id id )
-{
- return static_cast<UnitType&>( get( id, (test_unit_type)UnitType::type ) );
-}
-BOOST_TEST_DECL test_unit& get( test_unit_id, test_unit_type );
-#else
+
BOOST_TEST_DECL test_unit& get( test_unit_id, test_unit_type );
template<typename UnitType>
UnitType& get( test_unit_id id )
{
return static_cast<UnitType&>( get( id, (test_unit_type)UnitType::type ) );
}
-#endif
// test initiation
BOOST_TEST_DECL void run( test_unit_id = INV_TEST_UNIT_ID, bool continue_test = true );
Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp (original)
+++ trunk/boost/test/impl/execution_monitor.ipp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -162,7 +162,8 @@
#ifdef __BORLANDC__
# define BOOST_TEST_VSNPRINTF( a1, a2, a3, a4 ) std::vsnprintf( (a1), (a2), (a3), (a4) )
#elif BOOST_WORKAROUND(_MSC_VER, <= 1310) || \
- BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3000))
+ BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3000)) || \
+ defined(UNDER_CE)
# define BOOST_TEST_VSNPRINTF( a1, a2, a3, a4 ) _vsnprintf( (a1), (a2), (a3), (a4) )
#else
# define BOOST_TEST_VSNPRINTF( a1, a2, a3, a4 ) vsnprintf( (a1), (a2), (a3), (a4) )
@@ -744,12 +745,6 @@
, m_dir( false )
{}
- // access methods
- static void seh_catch_preventer( unsigned int /* id */, _EXCEPTION_POINTERS* /* exps */ )
- {
- throw;
- }
-
void report() const;
int operator()( unsigned int id, _EXCEPTION_POINTERS* exps );
@@ -762,6 +757,12 @@
bool m_dir;
};
+static void
+seh_catch_preventer( unsigned int /* id */, _EXCEPTION_POINTERS* /* exps */ )
+{
+ throw;
+}
+
//____________________________________________________________________________//
int
@@ -962,7 +963,7 @@
_invalid_parameter_handler old_iph;
if( !p_catch_system_errors )
- _set_se_translator( &detail::system_signal_exception::seh_catch_preventer );
+ _set_se_translator( &detail::seh_catch_preventer );
else {
if( !!p_detect_fp_exceptions )
detail::switch_fp_exceptions( true );
Modified: trunk/boost/test/impl/test_tools.ipp
==============================================================================
--- trunk/boost/test/impl/test_tools.ipp (original)
+++ trunk/boost/test/impl/test_tools.ipp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -611,8 +611,6 @@
#ifdef BOOST_NO_STRINGSTREAM
m_pimpl->m_synced_string.assign( str(), pcount() );
freeze( false );
-#elif BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
- m_pimpl->m_synced_string.assign( str().c_str(), tellp() );
#else
m_pimpl->m_synced_string = str();
#endif
Modified: trunk/boost/test/impl/unit_test_suite.ipp
==============================================================================
--- trunk/boost/test/impl/unit_test_suite.ipp (original)
+++ trunk/boost/test/impl/unit_test_suite.ipp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -71,11 +71,7 @@
bool
test_unit::check_dependencies() const
{
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
- BOOST_TEST_FOREACH( test_unit_id, tu_id, const_cast<test_unit*>(this)->m_dependencies ) {
-#else
BOOST_TEST_FOREACH( test_unit_id, tu_id, m_dependencies ) {
-#endif
if( !unit_test::results_collector.results( tu_id ).passed() )
return false;
}
Modified: trunk/boost/test/test_tools.hpp
==============================================================================
--- trunk/boost/test/test_tools.hpp (original)
+++ trunk/boost/test/test_tools.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -431,14 +431,6 @@
return print_helper_t<T>( t );
}
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530))
-template<typename T, std::size_t N>
-inline print_helper_t<T*> print_helper( T (&t)[N] )
-{
- return print_helper_t<T*>( &t[0] );
-}
-#endif
-
//____________________________________________________________________________//
template<typename T>
Modified: trunk/boost/test/utils/basic_cstring/basic_cstring.hpp
==============================================================================
--- trunk/boost/test/utils/basic_cstring/basic_cstring.hpp (original)
+++ trunk/boost/test/utils/basic_cstring/basic_cstring.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -713,11 +713,7 @@
template<typename CharT1, typename CharT2>
inline void
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
-assign_op( std::basic_string<CharT1>& target, basic_cstring<CharT2> const& src, int )
-#else
assign_op( std::basic_string<CharT1>& target, basic_cstring<CharT2> src, int )
-#endif
{
target.assign( src.begin(), src.size() );
}
Modified: trunk/boost/test/utils/fixed_mapping.hpp
==============================================================================
--- trunk/boost/test/utils/fixed_mapping.hpp (original)
+++ trunk/boost/test/utils/fixed_mapping.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -91,11 +91,8 @@
// key -> value access
value_ref_type operator[]( key_param_type key ) const
{
-#if BOOST_WORKAROUND(__SUNPRO_CC,BOOST_TESTED_AT(0x530))
- iterator it = std::lower_bound( m_map.begin(), m_map.end(), key, p1() );
-#else
iterator it = boost::detail::lower_bound( m_map.begin(), m_map.end(), key, p1() );
-#endif
+
return (it == m_map.end() || Compare()( key, it->first ) ) ? m_invalid_value : it->second;
}
Modified: trunk/boost/test/utils/foreach.hpp
==============================================================================
--- trunk/boost/test/utils/foreach.hpp (original)
+++ trunk/boost/test/utils/foreach.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -28,9 +28,7 @@
#include <boost/mpl/bool.hpp>
#include <boost/test/detail/workaround.hpp>
-#if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
#include <boost/type_traits/is_const.hpp>
-#endif
#include <boost/test/detail/suppress_warnings.hpp>
@@ -80,28 +78,6 @@
// ************** is_const ************** //
// ************************************************************************** //
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
-
-template<typename C>
-inline mpl::false_
-is_const_coll( C& )
-{
- return mpl::false_();
-}
-
-//____________________________________________________________________________//
-
-template<typename C>
-inline mpl::true_
-is_const_coll( C const& )
-{
- return mpl::true_();
-}
-
-//____________________________________________________________________________//
-
-#else
-
template<typename C>
inline is_const<C>
is_const_coll( C& )
@@ -111,10 +87,6 @@
//____________________________________________________________________________//
-#endif
-
-//____________________________________________________________________________//
-
// ************************************************************************** //
// ************** begin ************** //
// ************************************************************************** //
@@ -128,18 +100,6 @@
//____________________________________________________________________________//
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
-
-template<typename C>
-inline static_any<BOOST_DEDUCED_TYPENAME C::iterator>
-begin( C const& t, mpl::true_ )
-{
- typedef typename C::iterator it;
- return static_any<it>( const_cast<it>( t.begin() ) );
-}
-
-#else
-
template<typename C>
inline static_any<BOOST_DEDUCED_TYPENAME C::const_iterator>
begin( C const& t, mpl::true_ )
@@ -147,8 +107,6 @@
return static_any<BOOST_DEDUCED_TYPENAME C::const_iterator>( t.begin() );
}
-#endif
-
//____________________________________________________________________________//
// ************************************************************************** //
@@ -164,18 +122,6 @@
//____________________________________________________________________________//
-#if BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530) )
-
-template<typename C>
-inline static_any<BOOST_DEDUCED_TYPENAME C::iterator>
-end( C const& t, mpl::true_ )
-{
- typedef typename C::iterator it;
- return static_any<it>( const_cast<it>( t.end() ) );
-}
-
-#else
-
template<typename C>
inline static_any<BOOST_DEDUCED_TYPENAME C::const_iterator>
end( C const& t, mpl::true_ )
@@ -183,8 +129,6 @@
return static_any<BOOST_DEDUCED_TYPENAME C::const_iterator>( t.end() );
}
-#endif
-
//____________________________________________________________________________//
// ************************************************************************** //
Modified: trunk/boost/test/utils/named_params.hpp
==============================================================================
--- trunk/boost/test/utils/named_params.hpp (original)
+++ trunk/boost/test/utils/named_params.hpp 2007-10-24 00:48:16 EDT (Wed, 24 Oct 2007)
@@ -97,20 +97,6 @@
//____________________________________________________________________________//
-#if BOOST_WORKAROUND( __SUNPRO_CC, == 0x530 )
-
-struct unknown_id_helper {
- template<typename UnknownId>
- nil operator[]( keyword<UnknownId,false> kw ) const { return nil(); }
-
- template<typename UnknownId>
- bool has( keyword<UnknownId,false> ) const { return false; }
-};
-
-#endif
-
-//____________________________________________________________________________//
-
// ************************************************************************** //
// ************** named_parameter_combine ************** //
// ************************************************************************** //
@@ -162,9 +148,6 @@
template<typename T, typename unique_id,typename ReferenceType=T&>
struct named_parameter
: nfp_detail::named_parameter_base<named_parameter<T, unique_id,ReferenceType> >
-#if BOOST_WORKAROUND( __SUNPRO_CC, == 0x530 )
-, nfp_detail::unknown_id_helper
-#endif
{
typedef T data_type;
typedef ReferenceType ref_type;
@@ -176,20 +159,12 @@
// Access methods
ref_type operator[]( keyword<unique_id,true> ) const { return m_value; }
ref_type operator[]( keyword<unique_id,false> ) const { return m_value; }
-#if BOOST_WORKAROUND( __SUNPRO_CC, == 0x530 )
- using nfp_detail::unknown_id_helper::operator[];
-#else
template<typename UnknownId>
nfp_detail::nil operator[]( keyword<UnknownId,false> ) const { return nfp_detail::nil(); }
-#endif
bool has( keyword<unique_id,false> ) const { return true; }
-#if BOOST_WORKAROUND( __SUNPRO_CC, == 0x530 )
- using nfp_detail::unknown_id_helper::has;
-#else
template<typename UnknownId>
bool has( keyword<UnknownId,false> ) const { return false; }
-#endif
// Visitation support
template<typename Visitor>