? bin ? msc_ver-2005-03-01.patch ? vc60.pdb ? tools/build/jam_src/bin.ntx86 ? tools/build/jam_src/bootstrap ? tools/build/jam_src/vc60.pdb ? tools/build/v1/msevc4-stlport-tools.jam ? tools/build/v1/msevc4-tools.jam Index: boost/aligned_storage.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/aligned_storage.hpp,v retrieving revision 1.9 diff -u -r1.9 aligned_storage.hpp --- boost/aligned_storage.hpp 5 Feb 2005 12:49:06 -0000 1.9 +++ boost/aligned_storage.hpp 1 Mar 2005 15:57:38 -0000 @@ -109,7 +109,7 @@ return &data_.buf[0]; } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) const void* address() const { @@ -124,7 +124,7 @@ }; -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // MSVC6 seems not to like inline functions with const void* returns, so we // declare the following here: Index: boost/intrusive_ptr.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/intrusive_ptr.hpp,v retrieving revision 1.19 diff -u -r1.19 intrusive_ptr.hpp --- boost/intrusive_ptr.hpp 26 Jul 2004 00:31:58 -0000 1.19 +++ boost/intrusive_ptr.hpp 1 Mar 2005 15:57:38 -0000 @@ -249,7 +249,7 @@ #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; template basic_ostream & operator<< (basic_ostream & os, intrusive_ptr const & p) Index: boost/shared_ptr.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/shared_ptr.hpp,v retrieving revision 1.53 diff -u -r1.53 shared_ptr.hpp --- boost/shared_ptr.hpp 4 Feb 2005 16:28:50 -0000 1.53 +++ boost/shared_ptr.hpp 1 Mar 2005 15:57:39 -0000 @@ -426,7 +426,7 @@ #else -# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, <= 1200 && __SGI_STL_PORT) +# if defined(BOOST_MSVC) && BOOST_WORKAROUND(BOOST_MSVC, < 1300 && __SGI_STL_PORT) // MSVC6 has problems finding std::basic_ostream through the using declaration in namespace _STL using std::basic_ostream; template basic_ostream & operator<< (basic_ostream & os, shared_ptr const & p) Index: boost/archive/impl/basic_xml_grammar.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/archive/impl/basic_xml_grammar.hpp,v retrieving revision 1.6 diff -u -r1.6 basic_xml_grammar.hpp --- boost/archive/impl/basic_xml_grammar.hpp 2 Feb 2005 05:31:54 -0000 1.6 +++ boost/archive/impl/basic_xml_grammar.hpp 1 Mar 2005 15:57:39 -0000 @@ -51,7 +51,7 @@ #include // supress noise -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif @@ -62,13 +62,13 @@ // the following hack is to evade a bogus error generated by using the // word "arg" when bind.hpp has been included -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #define arg xarg #endif #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #undef arg #endif Index: boost/config/auto_link.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/config/auto_link.hpp,v retrieving revision 1.13 diff -u -r1.13 auto_link.hpp --- boost/config/auto_link.hpp 29 Dec 2004 11:07:19 -0000 1.13 +++ boost/config/auto_link.hpp 1 Mar 2005 15:57:40 -0000 @@ -109,7 +109,12 @@ // select toolset if not defined already: // #ifndef BOOST_LIB_TOOLSET -#if defined(BOOST_MSVC) && (BOOST_MSVC == 1200) +#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300) && defined(_WIN32_WCE) + + // embedded visual C 4: +# define BOOST_LIB_TOOLSET "evc4" + +#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1200) // vc6: # define BOOST_LIB_TOOLSET "vc6" Index: boost/config/stdlib/stlport.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/config/stdlib/stlport.hpp,v retrieving revision 1.27 diff -u -r1.27 stlport.hpp --- boost/config/stdlib/stlport.hpp 5 Sep 2004 10:54:21 -0000 1.27 +++ boost/config/stdlib/stlport.hpp 1 Mar 2005 15:57:40 -0000 @@ -52,7 +52,7 @@ // then the io stream facets are not available in namespace std:: // #ifdef _STLPORT_VERSION -# if !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) +# if (_STLP_MAJOR<5) && !defined(_STLP_OWN_IOSTREAMS) && defined(_STLP_USE_NAMESPACES) && defined(BOOST_NO_USING_TEMPLATE) && !defined(__BORLANDC__) # define BOOST_NO_STD_LOCALE # endif #else @@ -62,7 +62,7 @@ #endif // -// Without member template support enabled, their are no template +// Without member template support enabled, there are no template // iterate constructors, and no std::allocator: // #if !(defined(__STL_MEMBER_TEMPLATES) || defined(_STLP_MEMBER_TEMPLATES)) Index: boost/date_time/compiler_config.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/compiler_config.hpp,v retrieving revision 1.33 diff -u -r1.33 compiler_config.hpp --- boost/date_time/compiler_config.hpp 19 Feb 2005 22:26:19 -0000 1.33 +++ boost/date_time/compiler_config.hpp 1 Mar 2005 15:57:40 -0000 @@ -78,7 +78,7 @@ // gcc295, msvc (neither with STLPort), any borland // #if (((defined(__GNUC__) && (__GNUC__ < 3)) || \ - (defined(_MSC_VER) && (_MSC_VER <= 1200)) ) && \ + (defined(_MSC_VER) && (_MSC_VER < 1300)) ) && \ !defined(_STLP_OWN_IOSTREAMS) ) || \ defined(__BORLANDC__) #define BOOST_DATE_TIME_INCLUDE_LIMITED_HEADERS Index: boost/date_time/date_parsing.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/date_parsing.hpp,v retrieving revision 1.22 diff -u -r1.22 date_parsing.hpp --- boost/date_time/date_parsing.hpp 27 Jan 2005 11:09:50 -0000 1.22 +++ boost/date_time/date_parsing.hpp 1 Mar 2005 15:57:41 -0000 @@ -244,7 +244,7 @@ return parse_date(ss.str()); } #endif // BOOST_NO_STD_WSTRING -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // This function cannot be compiled with MSVC 6.0 due to internal compiler shorcomings #else //! function called by wrapper functions: date_period_from_(w)string() @@ -269,7 +269,7 @@ date_type d2 = from_stream_type(date_string_start, date_string_end, value_type()); return period(d1, d2); } -#endif // _MSC_VER <= 1200 +#endif } } //namespace date_time Index: boost/date_time/locale_config.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/locale_config.hpp,v retrieving revision 1.3 diff -u -r1.3 locale_config.hpp --- boost/date_time/locale_config.hpp 19 Dec 2003 14:20:30 -0000 1.3 +++ boost/date_time/locale_config.hpp 1 Mar 2005 15:57:41 -0000 @@ -19,7 +19,7 @@ #include "boost/config.hpp" //sets BOOST_NO_STD_LOCALE //This file basically becomes a noop if locales are not properly supported -#if (defined(BOOST_NO_STD_LOCALE) || (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x564 ))) +#if (defined(BOOST_NO_STD_LOCALE) || (defined(BOOST_MSVC) && (_MSC_VER < 1300)) || (defined(__BORLANDC__) && (__BORLANDC__ < 0x564 ))) #define BOOST_DATE_TIME_NO_LOCALE #endif Index: boost/date_time/time_facet.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/time_facet.hpp,v retrieving revision 1.4 diff -u -r1.4 time_facet.hpp --- boost/date_time/time_facet.hpp 16 Feb 2005 13:04:40 -0000 1.4 +++ boost/date_time/time_facet.hpp 1 Mar 2005 15:57:41 -0000 @@ -327,7 +327,7 @@ ss.imbue(std::locale::classic()); // don't want any formatting ss << std::setw(time_duration_type::num_fractional_digits()) << std::setfill(static_cast('0')); -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 // JDG [7/6/02 VC++ compatibility] char_type buff[34]; ss << _i64toa(static_cast(frac_sec), buff, 10); Index: boost/date_time/time_parsing.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/time_parsing.hpp,v retrieving revision 1.11 diff -u -r1.11 time_parsing.hpp --- boost/date_time/time_parsing.hpp 6 Dec 2004 02:07:52 -0000 1.11 +++ boost/date_time/time_parsing.hpp 1 Mar 2005 15:57:41 -0000 @@ -67,7 +67,7 @@ case 3: { //Works around a bug in MSVC 6 library that does not support //operator>> thus meaning lexical_cast will fail to compile. -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 fs = _atoi64(beg->c_str()); // msvc wouldn't compile 'time_duration::num_fractional_digits()' // (required template argument list) as a workaround a temp Index: boost/date_time/time_resolution_traits.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/date_time/time_resolution_traits.hpp,v retrieving revision 1.8 diff -u -r1.8 time_resolution_traits.hpp --- boost/date_time/time_resolution_traits.hpp 3 Dec 2003 03:01:05 -0000 1.8 +++ boost/date_time/time_resolution_traits.hpp 1 Mar 2005 15:57:42 -0000 @@ -61,7 +61,7 @@ template= 1200) +#if (defined _MSC_VER) && (_MSC_VER >= 1020) # pragma once #endif Index: boost/detail/workaround.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/detail/workaround.hpp,v retrieving revision 1.10 diff -u -r1.10 workaround.hpp --- boost/detail/workaround.hpp 26 Jul 2004 00:31:59 -0000 1.10 +++ boost/detail/workaround.hpp 1 Mar 2005 15:57:42 -0000 @@ -9,7 +9,7 @@ // // Usage: // -// #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +// #if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ... // workaround code here // #endif // @@ -17,7 +17,7 @@ // first argument must be undefined or expand to a numeric // value. The above expands to: // -// (BOOST_MSVC) != 0 && (BOOST_MSVC) <= 1200 +// (BOOST_MSVC) != 0 && (BOOST_MSVC) < 1300 // // When used for workarounds that apply to the latest known version // and all earlier versions of a compiler, the following convention Index: boost/filesystem/fstream.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/filesystem/fstream.hpp,v retrieving revision 1.7 diff -u -r1.7 fstream.hpp --- boost/filesystem/fstream.hpp 25 Nov 2003 18:29:13 -0000 1.7 +++ boost/filesystem/fstream.hpp 1 Mar 2005 15:57:43 -0000 @@ -29,7 +29,7 @@ { public: virtual ~basic_filebuf() {} -#if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this +#if !BOOST_WORKAROUND( BOOST_MSVC, < 1300 ) // VC++ 6.0 can't handle this std::basic_filebuf * open( const path & file_ph, std::ios_base::openmode mode ) { @@ -54,7 +54,7 @@ std::ios_base::openmode mode = std::ios_base::in ) : std::basic_ifstream( file_ph.native_file_string().c_str(), mode ) {} -# if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this +# if !BOOST_WORKAROUND( BOOST_MSVC, < 1300 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in ) { @@ -100,7 +100,7 @@ std::ios_base::openmode mode = std::ios_base::out ) : std::basic_ofstream( file_ph.native_file_string().c_str(), mode ) {} -# if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this +# if !BOOST_WORKAROUND( BOOST_MSVC, < 1300 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::out ) { @@ -146,7 +146,7 @@ std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) : std::basic_fstream( file_ph.native_file_string().c_str(), mode ) {} -# if !BOOST_WORKAROUND( BOOST_MSVC, <= 1200 ) // VC++ 6.0 can't handle this +# if !BOOST_WORKAROUND( BOOST_MSVC, < 1300 ) // VC++ 6.0 can't handle this void open( const path & file_ph, std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out ) { Index: boost/function/function_template.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/function/function_template.hpp,v retrieving revision 1.79 diff -u -r1.79 function_template.hpp --- boost/function/function_template.hpp 26 Dec 2004 22:05:19 -0000 1.79 +++ boost/function/function_template.hpp 1 Mar 2005 15:57:43 -0000 @@ -174,7 +174,7 @@ > struct BOOST_FUNCTION_GET_FUNCTION_INVOKER { - typedef typename ct_if<(is_void::value), + typedef typename ct_if::value, BOOST_FUNCTION_VOID_FUNCTION_INVOKER< FunctionPtr, R BOOST_FUNCTION_COMMA @@ -195,7 +195,7 @@ > struct BOOST_FUNCTION_GET_FUNCTION_OBJ_INVOKER { - typedef typename ct_if<(is_void::value), + typedef typename ct_if::value, BOOST_FUNCTION_VOID_FUNCTION_OBJ_INVOKER< FunctionObj, R BOOST_FUNCTION_COMMA @@ -216,7 +216,7 @@ > struct BOOST_FUNCTION_GET_STATELESS_FUNCTION_OBJ_INVOKER { - typedef typename ct_if<(is_void::value), + typedef typename ct_if::value, BOOST_FUNCTION_STATELESS_VOID_FUNCTION_OBJ_INVOKER< FunctionObj, R BOOST_FUNCTION_COMMA @@ -312,7 +312,7 @@ ~BOOST_FUNCTION_FUNCTION() { clear(); } -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // MSVC 6.0 and prior require all definitions to be inline, but // these definitions can become very costly. result_type operator()(BOOST_FUNCTION_PARMS) const @@ -559,7 +559,7 @@ f1.swap(f2); } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template typename BOOST_FUNCTION_FUNCTION< Index: boost/iterator/filter_iterator.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/filter_iterator.hpp,v retrieving revision 1.9 diff -u -r1.9 filter_iterator.hpp --- boost/iterator/filter_iterator.hpp 13 Dec 2004 09:31:17 -0000 1.9 +++ boost/iterator/filter_iterator.hpp 1 Mar 2005 15:57:44 -0000 @@ -122,7 +122,7 @@ , Iterator >::type x , Iterator end = Iterator() -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) , Predicate* = 0 #endif ) Index: boost/iterator/iterator_categories.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/iterator_categories.hpp,v retrieving revision 1.8 diff -u -r1.8 iterator_categories.hpp --- boost/iterator/iterator_categories.hpp 2 Sep 2004 15:40:40 -0000 1.8 +++ boost/iterator/iterator_categories.hpp 1 Mar 2005 15:57:44 -0000 @@ -97,7 +97,7 @@ > {}; -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) template <> struct old_category_to_traversal { @@ -131,7 +131,7 @@ { }; -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) template <> struct pure_traversal_tag { Index: boost/iterator/iterator_facade.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/iterator_facade.hpp,v retrieving revision 1.32 diff -u -r1.32 iterator_facade.hpp --- boost/iterator/iterator_facade.hpp 15 Feb 2005 12:41:23 -0000 1.32 +++ boost/iterator/iterator_facade.hpp 1 Mar 2005 15:57:45 -0000 @@ -327,7 +327,7 @@ } }; -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // Deal with ETI template<> struct operator_arrow_result @@ -410,7 +410,7 @@ : # ifdef BOOST_NO_ONE_WAY_ITERATOR_INTEROP iterator_difference -# elif BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# elif BOOST_WORKAROUND(BOOST_MSVC, < 1300) mpl::if_< is_convertible , typename I1::difference_type @@ -666,7 +666,7 @@ return this->derived(); } -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) typename detail::postfix_increment_result::type operator++(int) { @@ -708,11 +708,11 @@ return result -= x; } -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // There appears to be a bug which trashes the data of classes // derived from iterator_facade when they are assigned unless we // define this assignment operator. This bug is only revealed - // (so far) in STLPort debug mode, but it's clearly a codegen + // (so far) in STLport debug mode, but it's clearly a codegen // problem so we apply the workaround for all MSVC6. iterator_facade& operator=(iterator_facade const&) { @@ -721,7 +721,7 @@ # endif }; -# if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template typename detail::postfix_increment_result::type operator++( Index: boost/iterator/iterator_traits.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/iterator_traits.hpp,v retrieving revision 1.2 diff -u -r1.2 iterator_traits.hpp --- boost/iterator/iterator_traits.hpp 26 Jul 2004 00:32:00 -0000 1.2 +++ boost/iterator/iterator_traits.hpp 1 Mar 2005 15:57:45 -0000 @@ -55,7 +55,7 @@ typedef typename detail::iterator_traits::iterator_category type; }; -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) template <> struct iterator_value { Index: boost/iterator/zip_iterator.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/zip_iterator.hpp,v retrieving revision 1.8 diff -u -r1.8 zip_iterator.hpp --- boost/iterator/zip_iterator.hpp 2 Sep 2004 15:40:40 -0000 1.8 +++ boost/iterator/zip_iterator.hpp 1 Mar 2005 15:57:46 -0000 @@ -180,11 +180,11 @@ > struct tuple_meta_accumulate : mpl::eval_if< -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) mpl::or_< #endif boost::is_same -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) , boost::is_same > #endif @@ -381,7 +381,7 @@ >::type type; }; -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround template <> struct minimum_traversal_category_in_iterator_tuple { Index: boost/iterator/detail/enable_if.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/detail/enable_if.hpp,v retrieving revision 1.3 diff -u -r1.3 enable_if.hpp --- boost/iterator/detail/enable_if.hpp 12 Aug 2004 17:00:15 -0000 1.3 +++ boost/iterator/detail/enable_if.hpp 1 Mar 2005 15:57:46 -0000 @@ -72,7 +72,7 @@ : mpl::identity # endif { -# if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef Return type; # endif }; Index: boost/iterator/detail/minimum_category.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/iterator/detail/minimum_category.hpp,v retrieving revision 1.7 diff -u -r1.7 minimum_category.hpp --- boost/iterator/detail/minimum_category.hpp 2 Sep 2004 15:40:40 -0000 1.7 +++ boost/iterator/detail/minimum_category.hpp 1 Mar 2005 15:57:46 -0000 @@ -22,7 +22,7 @@ // template struct minimum_category_impl -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) { template struct apply { @@ -77,12 +77,12 @@ struct minimum_category { typedef minimum_category_impl< -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround is_same::value || # endif ::boost::is_convertible::value , ::boost::is_convertible::value -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround || is_same::value # endif > outer; @@ -103,7 +103,7 @@ BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(2,minimum_category,(mpl::_1,mpl::_2)) }; -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) // ETI workaround +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ETI workaround template <> struct minimum_category { Index: boost/logic/tribool_io.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/logic/tribool_io.hpp,v retrieving revision 1.3 diff -u -r1.3 tribool_io.hpp --- boost/logic/tribool_io.hpp 25 Jul 2004 02:29:29 -0000 1.3 +++ boost/logic/tribool_io.hpp 1 Mar 2005 15:57:47 -0000 @@ -104,7 +104,7 @@ inline std::basic_string get_default_indeterminate_name() { return "indeterminate"; } -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // VC++ 6.0 chokes on the specialization below, so we're stuck without // wchar_t support. What a pain. #else Index: boost/mpl/apply_fwd.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/apply_fwd.hpp,v retrieving revision 1.2 diff -u -r1.2 apply_fwd.hpp --- boost/mpl/apply_fwd.hpp 2 Sep 2004 15:40:41 -0000 1.2 +++ boost/mpl/apply_fwd.hpp 1 Mar 2005 15:57:47 -0000 @@ -44,7 +44,7 @@ // agurt, 15/jan/02: top-level 'apply' template gives an ICE on MSVC // (for known reasons) -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # define BOOST_MPL_CFG_NO_APPLY_TEMPLATE #endif Index: boost/mpl/is_sequence.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/is_sequence.hpp,v retrieving revision 1.8 diff -u -r1.8 is_sequence.hpp --- boost/mpl/is_sequence.hpp 2 Sep 2004 15:40:41 -0000 1.8 +++ boost/mpl/is_sequence.hpp 1 Mar 2005 15:57:47 -0000 @@ -29,7 +29,7 @@ #include #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include #elif BOOST_WORKAROUND(BOOST_MSVC, == 1300) # include @@ -63,7 +63,7 @@ > struct is_sequence : if_< -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) aux::msvc_is_class #else boost::is_class Index: boost/mpl/aux_/has_rebind.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/aux_/has_rebind.hpp,v retrieving revision 1.13 diff -u -r1.13 has_rebind.hpp --- boost/mpl/aux_/has_rebind.hpp 28 Nov 2004 01:33:58 -0000 1.13 +++ boost/mpl/aux_/has_rebind.hpp 1 Mar 2005 15:57:47 -0000 @@ -20,7 +20,7 @@ #if BOOST_WORKAROUND(__EDG_VERSION__, <= 244) && !defined(BOOST_INTEL_CXX_VERSION) # include -#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include # include # include @@ -43,7 +43,7 @@ BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_rebind, rebind, false) -#elif BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif BOOST_WORKAROUND(BOOST_MSVC, < 1300) BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_rebind_impl, rebind, false) Index: boost/mpl/aux_/lambda_support.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/aux_/lambda_support.hpp,v retrieving revision 1.12 diff -u -r1.12 lambda_support.hpp --- boost/mpl/aux_/lambda_support.hpp 28 Nov 2004 01:37:05 -0000 1.12 +++ boost/mpl/aux_/lambda_support.hpp 1 Mar 2005 15:57:48 -0000 @@ -122,7 +122,7 @@ , name< BOOST_MPL_PP_ENUM(i,::boost::mpl::na) >* \ ); \ /**/ -#elif !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#elif !BOOST_WORKAROUND(BOOST_MSVC, < 1300) # define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) \ template< BOOST_MPL_PP_PARAMS(i,typename T) > \ ::boost::mpl::aux::yes_tag operator|( \ Index: boost/mpl/aux_/numeric_op.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/aux_/numeric_op.hpp,v retrieving revision 1.9 diff -u -r1.9 numeric_op.hpp --- boost/mpl/aux_/numeric_op.hpp 20 Dec 2004 19:17:06 -0000 1.9 +++ boost/mpl/aux_/numeric_op.hpp 1 Mar 2005 15:57:48 -0000 @@ -145,7 +145,7 @@ #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && BOOST_WORKAROUND(BOOST_MSVC, != 1200) + && BOOST_WORKAROUND(BOOST_MSVC, >= 1300) template< typename T > struct AUX778076_OP_TAG_NAME : tag { Index: boost/mpl/aux_/yes_no.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/mpl/aux_/yes_no.hpp,v retrieving revision 1.7 diff -u -r1.7 yes_no.hpp --- boost/mpl/aux_/yes_no.hpp 28 Sep 2004 13:56:59 -0000 1.7 +++ boost/mpl/aux_/yes_no.hpp 1 Mar 2005 15:57:48 -0000 @@ -38,7 +38,7 @@ template< BOOST_MPL_AUX_NTTP_DECL(long, n) > struct weighted_tag { -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef char (&type)[n]; #else char buf[n]; Index: boost/multi_array/base.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/multi_array/base.hpp,v retrieving revision 1.13 diff -u -r1.13 base.hpp --- boost/multi_array/base.hpp 2 Sep 2004 15:41:22 -0000 1.13 +++ boost/multi_array/base.hpp 1 Mar 2005 15:57:52 -0000 @@ -201,7 +201,7 @@ >::type type; }; -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) struct eti_value_accessor { @@ -251,7 +251,7 @@ template class multi_array_impl_base : -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) public mpl::aux::msvc_eti_base< typename value_accessor_generator >::type >::type Index: boost/multi_array/iterator.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/multi_array/iterator.hpp,v retrieving revision 1.11 diff -u -r1.11 iterator.hpp --- boost/multi_array/iterator.hpp 1 Dec 2003 19:07:09 -0000 1.11 +++ boost/multi_array/iterator.hpp 1 Mar 2005 15:57:52 -0000 @@ -56,11 +56,11 @@ , Reference > , private -#if BOOST_WORKAROUND(BOOST_MSVC,==1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) mpl::aux::msvc_eti_base::type -#if BOOST_WORKAROUND(BOOST_MSVC,==1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) >::type #endif { Index: boost/optional/optional.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/optional/optional.hpp,v retrieving revision 1.3 diff -u -r1.3 optional.hpp --- boost/optional/optional.hpp 21 Sep 2004 14:54:31 -0000 1.3 +++ boost/optional/optional.hpp 1 Mar 2005 15:57:54 -0000 @@ -29,7 +29,7 @@ #include "boost/detail/none_t.hpp" #include "boost/utility/compare_pointees.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // VC6.0 has the following bug: // When a templated assignment operator exist, an implicit conversion // constructing an optional is used when assigment of the form: Index: boost/python/object_core.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/python/object_core.hpp,v retrieving revision 1.46 diff -u -r1.46 object_core.hpp --- boost/python/object_core.hpp 5 Feb 2005 07:36:14 -0000 1.46 +++ boost/python/object_core.hpp 1 Mar 2005 15:57:56 -0000 @@ -300,7 +300,7 @@ template explicit object( T const& x -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // use some SFINAE to un-confuse MSVC about its // copy-initialization ambiguity claim. , typename mpl::if_,int&,int>::type* = 0 Index: boost/python/detail/config.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/python/detail/config.hpp,v retrieving revision 1.37 diff -u -r1.37 config.hpp --- boost/python/detail/config.hpp 29 Nov 2004 21:32:14 -0000 1.37 +++ boost/python/detail/config.hpp 1 Mar 2005 15:57:56 -0000 @@ -29,7 +29,7 @@ # endif # if defined(BOOST_MSVC) -# if _MSC_VER <= 1200 +# if _MSC_VER < 1300 # define BOOST_MSVC6_OR_EARLIER 1 # endif Index: boost/python/object/forward.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/python/object/forward.hpp,v retrieving revision 1.12 diff -u -r1.12 forward.hpp --- boost/python/object/forward.hpp 26 Jul 2004 00:32:07 -0000 1.12 +++ boost/python/object/forward.hpp 1 Mar 2005 15:57:56 -0000 @@ -12,7 +12,7 @@ # include # include # include -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include # include # include @@ -42,7 +42,7 @@ template struct forward : mpl::if_< -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // vc6 chokes on unforwarding enums nested in classes mpl::and_< is_scalar Index: boost/python/suite/indexing/indexing_suite.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/python/suite/indexing/indexing_suite.hpp,v retrieving revision 1.10 diff -u -r1.10 indexing_suite.hpp --- boost/python/suite/indexing/indexing_suite.hpp 20 Aug 2004 11:09:18 -0000 1.10 +++ boost/python/suite/indexing/indexing_suite.hpp 1 Mar 2005 15:57:57 -0000 @@ -125,7 +125,7 @@ typedef detail::container_element container_element_t; -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) struct return_policy : return_internal_reference<> {}; #else typedef return_internal_reference<> return_policy; Index: boost/random/shuffle_output.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/random/shuffle_output.hpp,v retrieving revision 1.9 diff -u -r1.9 shuffle_output.hpp --- boost/random/shuffle_output.hpp 27 Jul 2004 03:43:32 -0000 1.9 +++ boost/random/shuffle_output.hpp 1 Mar 2005 15:57:57 -0000 @@ -46,7 +46,7 @@ BOOST_STATIC_CONSTANT(int, buffer_size = k); shuffle_output() : _rng() { init(); } -#if defined(BOOST_MSVC) && _MSC_VER <= 1200 +#if defined(BOOST_MSVC) && _MSC_VER < 1300 // MSVC does not implicitly generate the copy constructor here shuffle_output(const shuffle_output & x) : _rng(x._rng), y(x.y) { std::copy(x.v, x.v+k, v); } Index: boost/regex/v4/instances.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/regex/v4/instances.hpp,v retrieving revision 1.14 diff -u -r1.14 instances.hpp --- boost/regex/v4/instances.hpp 21 Jan 2005 17:22:23 -0000 1.14 +++ boost/regex/v4/instances.hpp 1 Mar 2005 15:57:57 -0000 @@ -73,14 +73,14 @@ # endif template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T >; -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template class BOOST_REGEX_DECL match_results< const BOOST_REGEX_CHAR_T* >; #endif #ifndef BOOST_NO_STD_ALLOCATOR template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher::allocator_type, boost::regex_traits >; #endif #if !(defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB <= 1)) && !(defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800)) -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template class BOOST_REGEX_DECL match_results< std::basic_string::const_iterator >; #endif #ifndef BOOST_NO_STD_ALLOCATOR Index: boost/regex/v4/match_flags.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/regex/v4/match_flags.hpp,v retrieving revision 1.12 diff -u -r1.12 match_flags.hpp --- boost/regex/v4/match_flags.hpp 21 Jan 2005 17:22:23 -0000 1.12 +++ boost/regex/v4/match_flags.hpp 1 Mar 2005 15:57:57 -0000 @@ -73,7 +73,7 @@ } match_flags; -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) typedef unsigned long match_flag_type; #else typedef match_flags match_flag_type; Index: boost/regex/v4/regex_token_iterator.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/regex/v4/regex_token_iterator.hpp,v retrieving revision 1.27 diff -u -r1.27 regex_token_iterator.hpp --- boost/regex/v4/regex_token_iterator.hpp 21 Jan 2005 17:22:38 -0000 1.27 +++ boost/regex/v4/regex_token_iterator.hpp 1 Mar 2005 15:57:58 -0000 @@ -283,7 +283,7 @@ { return regex_token_iterator::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m); } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) template inline regex_token_iterator make_regex_token_iterator(const charT* p, const basic_regex& e, const int (&submatch)[N], regex_constants::match_flag_type m = regex_constants::match_default) { Index: boost/serialization/nvp.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/serialization/nvp.hpp,v retrieving revision 1.5 diff -u -r1.5 nvp.hpp --- boost/serialization/nvp.hpp 27 Jan 2005 17:51:50 -0000 1.5 +++ boost/serialization/nvp.hpp 1 Mar 2005 15:57:58 -0000 @@ -21,7 +21,7 @@ #include #include // supress noise -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: boost/spirit/fusion/detail/config.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/spirit/fusion/detail/config.hpp,v retrieving revision 1.10 diff -u -r1.10 config.hpp --- boost/spirit/fusion/detail/config.hpp 16 Feb 2005 18:01:35 -0000 1.10 +++ boost/spirit/fusion/detail/config.hpp 1 Mar 2005 15:57:59 -0000 @@ -12,7 +12,7 @@ #include #include #include -#if BOOST_WORKAROUND(BOOST_MSVC,==1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) #include #endif @@ -79,7 +79,7 @@ // /////////////////////////////////////////////////////////////////////////////// #if BOOST_WORKAROUND(__BORLANDC__, <= 0x551) \ - || BOOST_WORKAROUND(BOOST_MSVC, <= 1200) + || BOOST_WORKAROUND(BOOST_MSVC, < 1300) namespace boost { namespace fusion { namespace detail { template @@ -88,7 +88,7 @@ BOOST_STATIC_CONSTANT(int, value = T::value); }; -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // VC6 ETI (early template instantiation) bug workaround. template <> @@ -101,7 +101,7 @@ #endif #if BOOST_WORKAROUND(__BORLANDC__, <= 0x551) \ - || BOOST_WORKAROUND(BOOST_MSVC, <= 1200) + || BOOST_WORKAROUND(BOOST_MSVC, < 1300) # define FUSION_GET_VALUE(T) ::boost::fusion::detail::get_value::value #else # define FUSION_GET_VALUE(T) T::value @@ -249,7 +249,7 @@ // T::types wrapper // /////////////////////////////////////////////////////////////////////////////// -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(types) # define FUSION_GET_TYPES(T) ::boost::fusion::detail::get_types::type #else @@ -261,7 +261,7 @@ // T::index wrapper // /////////////////////////////////////////////////////////////////////////////// -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(index) # define FUSION_GET_INDEX(T) ::boost::fusion::detail::get_index::type #else @@ -273,7 +273,7 @@ // T::tuple wrapper // /////////////////////////////////////////////////////////////////////////////// -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(tuple) # define FUSION_GET_TUPLE(T) ::boost::fusion::detail::get_tuple::type #else @@ -285,7 +285,7 @@ // T::size wrapper // /////////////////////////////////////////////////////////////////////////////// -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(size) # define FUSION_GET_SIZE(T) ::boost::fusion::detail::get_size::type #else @@ -297,7 +297,7 @@ // T::value_type wrapper // /////////////////////////////////////////////////////////////////////////////// -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(value_type) # define FUSION_GET_VALUE_TYPE(T) ::boost::fusion::detail::get_value_type::type #else @@ -360,7 +360,7 @@ }} //namespace boost::fusion namespace boost {namespace fusion {namespace detail { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) template struct bool_base {}; template<> @@ -377,7 +377,7 @@ //It ICEs because operator int() const on mpl::int_ is inlined. //At the same time, another test using integral_c ICEs because operator int() is not inlined. //Only solution seems to be to define a special msvc_fusion_int for VC 6 to be used in tuple_iterator_base -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) namespace boost {namespace fusion {namespace detail{ template Index: boost/spirit/fusion/iterator/tuple_iterator.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/spirit/fusion/iterator/tuple_iterator.hpp,v retrieving revision 1.12 diff -u -r1.12 tuple_iterator.hpp --- boost/spirit/fusion/iterator/tuple_iterator.hpp 17 Feb 2005 14:14:17 -0000 1.12 +++ boost/spirit/fusion/iterator/tuple_iterator.hpp 1 Mar 2005 15:58:00 -0000 @@ -60,7 +60,7 @@ >::type type; -#if BOOST_WORKAROUND(BOOST_MSVC,==1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) tuple_iterator(tuple_iterator const& i); #else template @@ -76,7 +76,7 @@ tuple& t; }; -#if BOOST_WORKAROUND(BOOST_MSVC,==1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) template tuple_iterator::tuple_iterator(tuple_iterator const& i) : t(static_cast(i.get_tuple())) {} Index: boost/spirit/fusion/sequence/at.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/spirit/fusion/sequence/at.hpp,v retrieving revision 1.2 diff -u -r1.2 at.hpp --- boost/spirit/fusion/sequence/at.hpp 16 Feb 2005 18:02:21 -0000 1.2 +++ boost/spirit/fusion/sequence/at.hpp 1 Mar 2005 15:58:00 -0000 @@ -40,7 +40,7 @@ template struct at : at_c {}; } -#if! BOOST_WORKAROUND(BOOST_MSVC,<=1200) +#if! BOOST_WORKAROUND(BOOST_MSVC,< 1300) template inline typename meta::at_c::type at(sequence_base const& seq FUSION_GET_MSVC_WORKAROUND) Index: boost/spirit/fusion/sequence/detail/manip.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/spirit/fusion/sequence/detail/manip.hpp,v retrieving revision 1.10 diff -u -r1.10 manip.hpp --- boost/spirit/fusion/sequence/detail/manip.hpp 16 Feb 2005 18:02:26 -0000 1.10 +++ boost/spirit/fusion/sequence/detail/manip.hpp 1 Mar 2005 15:58:01 -0000 @@ -21,7 +21,7 @@ #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) FUSION_MSVC_ETI_WRAPPER(char_type) FUSION_MSVC_ETI_WRAPPER(traits_type) # define FUSION_GET_CHAR_TYPE(T) get_char_type::type Index: boost/test/parameterized_test.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/test/parameterized_test.hpp,v retrieving revision 1.2 diff -u -r1.2 parameterized_test.hpp --- boost/test/parameterized_test.hpp 21 Feb 2005 10:25:04 -0000 1.2 +++ boost/test/parameterized_test.hpp 1 Mar 2005 15:58:01 -0000 @@ -81,7 +81,7 @@ return (test_unit*)0; test_func_with_bound_param bound_test_func( m_test_func, *m_par_begin ); -#if BOOST_WORKAROUND(BOOST_MSVC,<=1200) +#if BOOST_WORKAROUND(BOOST_MSVC,< 1300) 0; #endif test_unit* res = new test_case( m_tc_name, bound_test_func ); Index: boost/test/utils/class_properties.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/test/utils/class_properties.hpp,v retrieving revision 1.5 diff -u -r1.5 class_properties.hpp --- boost/test/utils/class_properties.hpp 21 Feb 2005 10:17:27 -0000 1.5 +++ boost/test/utils/class_properties.hpp 1 Mar 2005 15:58:02 -0000 @@ -117,7 +117,7 @@ #undef DEFINE_PROPERTY_FREE_BINARY_OPERATOR -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #define DEFINE_PROPERTY_LOGICAL_OPERATOR( op ) \ template \ Index: boost/tuple/detail/tuple_basic_no_partial_spec.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/tuple/detail/tuple_basic_no_partial_spec.hpp,v retrieving revision 1.19 diff -u -r1.19 tuple_basic_no_partial_spec.hpp --- boost/tuple/detail/tuple_basic_no_partial_spec.hpp 27 Jul 2004 03:43:32 -0000 1.19 +++ boost/tuple/detail/tuple_basic_no_partial_spec.hpp 1 Mar 2005 15:58:03 -0000 @@ -105,7 +105,7 @@ // Each of vc6 and vc7 seem to require a different formulation // of this return type template -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) static typename add_reference::type>::type #else static typename add_const_reference::type Index: boost/type_traits/extent.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/type_traits/extent.hpp,v retrieving revision 1.1 diff -u -r1.1 extent.hpp --- boost/type_traits/extent.hpp 30 Jan 2005 15:47:44 -0000 1.1 +++ boost/type_traits/extent.hpp 1 Mar 2005 15:58:03 -0000 @@ -120,7 +120,7 @@ struct extent : public ::boost::integral_constant::value> { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef ::boost::integral_constant::value> base_; using base_::value; #endif Index: boost/type_traits/integral_constant.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/type_traits/integral_constant.hpp,v retrieving revision 1.1 diff -u -r1.1 integral_constant.hpp --- boost/type_traits/integral_constant.hpp 30 Jan 2005 15:47:44 -0000 1.1 +++ boost/type_traits/integral_constant.hpp 1 Mar 2005 15:58:03 -0000 @@ -59,7 +59,7 @@ template<> struct integral_constant : public mpl::true_ { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef mpl::true_ base_; using base_::value; #endif @@ -67,7 +67,7 @@ }; template<> struct integral_constant : public mpl::false_ { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) typedef mpl::false_ base_; using base_::value; #endif Index: boost/type_traits/is_enum.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/type_traits/is_enum.hpp,v retrieving revision 1.13 diff -u -r1.13 is_enum.hpp --- boost/type_traits/is_enum.hpp 30 Jan 2005 15:41:12 -0000 1.13 +++ boost/type_traits/is_enum.hpp 1 Mar 2005 15:58:03 -0000 @@ -52,7 +52,7 @@ template struct is_class_or_union { -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) || BOOST_WORKAROUND(__BORLANDC__, <= 0x570)// we simply can't detect it this way. +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) || BOOST_WORKAROUND(__BORLANDC__, <= 0x570)// we simply can't detect it this way. BOOST_STATIC_CONSTANT(bool, value = false); # else template static ::boost::type_traits::yes_type is_class_or_union_tester(void(U::*)(void)); Index: boost/type_traits/is_integral.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/type_traits/is_integral.hpp,v retrieving revision 1.9 diff -u -r1.9 is_integral.hpp --- boost/type_traits/is_integral.hpp 4 Sep 2004 10:34:48 -0000 1.9 +++ boost/type_traits/is_integral.hpp 1 Mar 2005 15:58:03 -0000 @@ -41,7 +41,7 @@ BOOST_TT_AUX_BOOL_TRAIT_CV_SPEC1(is_integral,wchar_t,true) #endif -#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1200)) \ +#if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ || (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \ || (defined(__BORLANDC__) && (__BORLANDC__ == 0x600) && (_MSC_VER == 1200)) BOOST_TT_AUX_BOOL_TRAIT_CV_SPEC1(is_integral,unsigned __int8,true) Index: boost/variant/get.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/variant/get.hpp,v retrieving revision 1.8 diff -u -r1.8 get.hpp --- boost/variant/get.hpp 19 Aug 2004 15:19:13 -0000 1.8 +++ boost/variant/get.hpp 1 Mar 2005 15:58:03 -0000 @@ -23,7 +23,7 @@ #include "boost/type_traits/add_reference.hpp" #include "boost/type_traits/add_pointer.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include "boost/mpl/bool.hpp" # include "boost/mpl/or.hpp" # include "boost/type_traits/is_same.hpp" @@ -77,7 +77,7 @@ public: // visitor interfaces -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) pointer operator()(reference operand) const { Index: boost/variant/static_visitor.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/variant/static_visitor.hpp,v retrieving revision 1.7 diff -u -r1.7 static_visitor.hpp --- boost/variant/static_visitor.hpp 26 Jul 2004 00:32:07 -0000 1.7 +++ boost/variant/static_visitor.hpp 1 Mar 2005 15:58:03 -0000 @@ -19,7 +19,7 @@ #include "boost/mpl/if.hpp" #include "boost/type_traits/is_base_and_derived.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include "boost/type_traits/is_same.hpp" #endif Index: boost/variant/variant.hpp =================================================================== RCS file: /cvsroot/boost/boost/boost/variant/variant.hpp,v retrieving revision 1.95 diff -u -r1.95 variant.hpp --- boost/variant/variant.hpp 19 Sep 2004 11:49:49 -0000 1.95 +++ boost/variant/variant.hpp 1 Mar 2005 15:58:05 -0000 @@ -311,7 +311,7 @@ : public static_visitor { -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) public: // visitor interface @@ -486,7 +486,7 @@ { } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) public: // visitor interface Index: libs/assign/test/list_inserter.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/assign/test/list_inserter.cpp,v retrieving revision 1.12 diff -u -r1.12 list_inserter.cpp --- libs/assign/test/list_inserter.cpp 5 Feb 2005 23:54:40 -0000 1.12 +++ libs/assign/test/list_inserter.cpp 1 Mar 2005 15:58:07 -0000 @@ -87,7 +87,7 @@ BOOST_CHECK_EQUAL( v[8], 7 ); BOOST_CHECK_EQUAL( v[16], 7 ); -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) push_back( v ) = repeat_fun( 10, &rand ); #else push_back( v ).repeat_fun( 10, &rand ); @@ -95,14 +95,14 @@ BOOST_CHECK_EQUAL( v.size(), 29u ); -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) push_back( v ) = 1,repeat( 10, 2 ),3; #else push_back( v )(1).repeat( 10, 2 )(3); #endif BOOST_CHECK_EQUAL( v.size(), 41u ); -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) push_back( v ) = 1,repeat_fun( 10, &rand ),2; #else push_back( v )(1).repeat_fun( 10, &rand )(2); Index: libs/date_time/test/testint64_range.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/date_time/test/testint64_range.cpp,v retrieving revision 1.5 diff -u -r1.5 testint64_range.cpp --- libs/date_time/test/testint64_range.cpp 26 Feb 2004 18:26:57 -0000 1.5 +++ libs/date_time/test/testint64_range.cpp 1 Mar 2005 15:58:08 -0000 @@ -13,7 +13,7 @@ int main() { -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 //skipping tests here due to lack of operator<< support in msvc6 std::cout << "Skipping tests on MSVC6" << std::endl; Index: libs/date_time/test/testint_adapter.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/date_time/test/testint_adapter.cpp,v retrieving revision 1.11 diff -u -r1.11 testint_adapter.cpp --- libs/date_time/test/testint_adapter.cpp 26 Feb 2004 18:26:57 -0000 1.11 +++ libs/date_time/test/testint_adapter.cpp 1 Mar 2005 15:58:08 -0000 @@ -16,7 +16,7 @@ { //MSVC 6 has problems with this, but it's not really important //so we will just skip them.... -#if (defined(BOOST_DATE_TIME_NO_LOCALE)) || (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_DATE_TIME_NO_LOCALE)) || (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 #else std::cout << "min: " << (int_type::min)().as_number() << std::endl; Index: libs/date_time/test/testtime_resolution_traits.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/date_time/test/testtime_resolution_traits.cpp,v retrieving revision 1.10 diff -u -r1.10 testtime_resolution_traits.cpp --- libs/date_time/test/testtime_resolution_traits.cpp 23 Nov 2003 16:12:00 -0000 1.10 +++ libs/date_time/test/testtime_resolution_traits.cpp 1 Mar 2005 15:58:08 -0000 @@ -53,12 +53,12 @@ nano_res::to_tick_count(0,1,0,0) == one_minute_nano); //skip io on VC6 b/c of lack of operator<< for int64 -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 #else std::cout << one_hour_micro << std::endl; #endif boost::int64_t one_hour_nano = one_hour_micro*1000; -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 #else std::cout << one_hour_nano << std::endl; #endif Index: libs/date_time/test/posix_time/testduration.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/date_time/test/posix_time/testduration.cpp,v retrieving revision 1.19 diff -u -r1.19 testduration.cpp --- libs/date_time/test/posix_time/testduration.cpp 11 Jul 2004 18:13:21 -0000 1.19 +++ libs/date_time/test/posix_time/testduration.cpp 1 Mar 2005 15:58:09 -0000 @@ -70,7 +70,7 @@ t_5 = t_2 + t_1; //VC6 goes ambiguous on the next line... -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 //sorry ticks() doesn't work on VC6 #else std::cout << t_5.ticks() << std::endl; @@ -138,7 +138,7 @@ millisec ms(9); // time_duration t_10(0,0,0,); //00:00:00.009 std::cout << "time_resolution: " << time_duration::resolution() << std::endl; -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 //sorry res_adjust() doesn't work on VC6 #else std::cout << "res_adjust " << time_res_traits::res_adjust() << std::endl; @@ -238,7 +238,7 @@ check("total milliseconds - one year", (t2-t1).total_milliseconds() == tms); tms = 3600*365*24*static_cast(1000000000); check("total nanoseconds - one year", (t2-t1).total_nanoseconds() == tms); -#if (defined(BOOST_MSVC) && (_MSC_VER <= 1200)) // 1200 == VC++ 6.0 +#if (defined(BOOST_MSVC) && (_MSC_VER < 1300)) // 1200 == VC++ 6.0 #else std::cout << "tms: " << (t2-t1).total_milliseconds() << std::endl; std::cout << "nano per year: " << (t2-t1).total_nanoseconds() << std::endl; Index: libs/iterator/test/filter_iterator_test.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/iterator/test/filter_iterator_test.cpp,v retrieving revision 1.10 diff -u -r1.10 filter_iterator_test.cpp --- libs/iterator/test/filter_iterator_test.cpp 13 Dec 2004 09:31:16 -0000 1.10 +++ libs/iterator/test/filter_iterator_test.cpp 1 Mar 2005 15:58:13 -0000 @@ -101,7 +101,7 @@ boost::function_requires< boost_concepts::ReadableIteratorConcept >(); boost::function_requires< boost_concepts::SinglePassIteratorConcept >(); } -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) // Causes Internal Error in linker. +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) // Causes Internal Error in linker. { typedef boost::iterator_archetype< dummyT @@ -129,7 +129,7 @@ boost::function_requires< boost_concepts::ForwardTraversalConcept >(); } -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) // Causes Internal Error in linker. +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) // Causes Internal Error in linker. { typedef boost::iterator_archetype< dummyT @@ -179,7 +179,7 @@ boost::function_requires< boost_concepts::BidirectionalTraversalConcept >(); } -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) // Causes Internal Error in linker. +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) // Causes Internal Error in linker. { typedef boost::iterator_archetype< dummyT Index: libs/iterator/test/indirect_iterator_test.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/iterator/test/indirect_iterator_test.cpp,v retrieving revision 1.8 diff -u -r1.8 indirect_iterator_test.cpp --- libs/iterator/test/indirect_iterator_test.cpp 2 Sep 2004 15:41:28 -0000 1.8 +++ libs/iterator/test/indirect_iterator_test.cpp 1 Mar 2005 15:58:13 -0000 @@ -151,7 +151,7 @@ dummyT(3), dummyT(4), dummyT(5) }; const int N = sizeof(array)/sizeof(dummyT); -# if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +# if BOOST_WORKAROUND(BOOST_MSVC, < 1300) boost::shared_ptr zz((dummyT*)0); // Why? I don't know, but it suppresses a bad instantiation. # endif Index: libs/iterator/test/reverse_iterator_test.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/iterator/test/reverse_iterator_test.cpp,v retrieving revision 1.12 diff -u -r1.12 reverse_iterator_test.cpp --- libs/iterator/test/reverse_iterator_test.cpp 19 Aug 2004 15:11:49 -0000 1.12 +++ libs/iterator/test/reverse_iterator_test.cpp 1 Mar 2005 15:58:15 -0000 @@ -66,7 +66,7 @@ boost::function_requires< boost_concepts::BidirectionalTraversalConcept >(); } #endif -#if !BOOST_WORKAROUND(BOOST_MSVC, == 1200) // Causes Internal Error in linker. +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) // Causes Internal Error in linker. { typedef boost::iterator_archetype< dummyT Index: libs/mpl/test/list_c.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/mpl/test/list_c.cpp,v retrieving revision 1.5 diff -u -r1.5 list_c.cpp --- libs/mpl/test/list_c.cpp 28 Nov 2004 03:35:12 -0000 1.5 +++ libs/mpl/test/list_c.cpp 1 Mar 2005 15:58:17 -0000 @@ -19,7 +19,7 @@ #include -#if !BOOST_WORKAROUND(BOOST_MSVC,<= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC,< 1300) MPL_TEST_CASE() { typedef list_c::type l1; Index: libs/mpl/test/set_c.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/mpl/test/set_c.cpp,v retrieving revision 1.2 diff -u -r1.2 set_c.cpp --- libs/mpl/test/set_c.cpp 28 Nov 2004 03:35:12 -0000 1.2 +++ libs/mpl/test/set_c.cpp 1 Mar 2005 15:58:18 -0000 @@ -35,7 +35,7 @@ #endif }} -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) MPL_TEST_CASE() { typedef set_c::type s1; Index: libs/mpl/test/vector_c.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/mpl/test/vector_c.cpp,v retrieving revision 1.4 diff -u -r1.4 vector_c.cpp --- libs/mpl/test/vector_c.cpp 28 Nov 2004 03:35:12 -0000 1.4 +++ libs/mpl/test/vector_c.cpp 1 Mar 2005 15:58:18 -0000 @@ -17,7 +17,7 @@ #include -#if !BOOST_WORKAROUND(BOOST_MSVC, <=1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) MPL_TEST_CASE() { typedef vector_c::type v1; Index: libs/mpl/test/aux_/msvc_is_class.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/mpl/test/aux_/msvc_is_class.cpp,v retrieving revision 1.2 diff -u -r1.2 msvc_is_class.cpp --- libs/mpl/test/aux_/msvc_is_class.cpp 2 Sep 2004 15:41:36 -0000 1.2 +++ libs/mpl/test/aux_/msvc_is_class.cpp 1 Mar 2005 15:58:18 -0000 @@ -14,7 +14,7 @@ #include #include -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) #include #include Index: libs/optional/test/optional_test_common.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/optional/test/optional_test_common.cpp,v retrieving revision 1.2 diff -u -r1.2 optional_test_common.cpp --- libs/optional/test/optional_test_common.cpp 3 Nov 2003 02:51:56 -0000 1.2 +++ libs/optional/test/optional_test_common.cpp 1 Mar 2005 15:58:20 -0000 @@ -222,7 +222,7 @@ template inline void check_value ( optional& opt, T const& v, T const& z ) { -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) // 1200 == VC++ 6.0 +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // 1200 == VC++ 6.0 // For some reason, VC6.0 is creating a temporary while evaluating (*opt == v), // so we need to turn throw on copy off first. reset_throw_on_copy( ARG(T) ) ; Index: libs/program_options/src/cmdline.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/program_options/src/cmdline.cpp,v retrieving revision 1.11 diff -u -r1.11 cmdline.cpp --- libs/program_options/src/cmdline.cpp 16 Feb 2005 09:03:12 -0000 1.11 +++ libs/program_options/src/cmdline.cpp 1 Mar 2005 15:58:23 -0000 @@ -76,7 +76,7 @@ namespace boost { namespace program_options { namespace detail { // vc6 needs this, but borland chokes when this is added. -#if BOOST_WORKAROUND(_MSC_VER, <= 1200) +#if BOOST_WORKAROUND(_MSC_VER, < 1300) using namespace std; using namespace program_options; #endif Index: libs/python/test/const_argument.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/python/test/const_argument.cpp,v retrieving revision 1.3 diff -u -r1.3 const_argument.cpp --- libs/python/test/const_argument.cpp 29 Oct 2004 03:19:27 -0000 1.3 +++ libs/python/test/const_argument.cpp 1 Mar 2005 15:58:24 -0000 @@ -14,7 +14,7 @@ BOOST_TT_BROKEN_COMPILER_SPEC( object ) -#if BOOST_WORKAROUND(BOOST_MSVC, == 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) bool accept_const_arg( object ); #endif Index: libs/random/random_test.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/random/random_test.cpp,v retrieving revision 1.53 diff -u -r1.53 random_test.cpp --- libs/random/random_test.cpp 3 Feb 2005 14:39:06 -0000 1.53 +++ libs/random/random_test.cpp 1 Mar 2005 15:58:25 -0000 @@ -445,7 +445,7 @@ check_uniform_int(uint1_4, 100000); } -#if defined(BOOST_MSVC) && _MSC_VER <= 1200 +#if defined(BOOST_MSVC) && _MSC_VER < 1300 // These explicit instantiations are necessary, otherwise MSVC does // not find the inline friends. Index: libs/range/test/array.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/range/test/array.cpp,v retrieving revision 1.9 diff -u -r1.9 array.cpp --- libs/range/test/array.cpp 5 Feb 2005 20:06:33 -0000 1.9 +++ libs/range/test/array.cpp 1 Mar 2005 15:58:25 -0000 @@ -34,7 +34,7 @@ // BOOST_RANGE_NO_STATIC_ASSERT -#if !defined( __BORLANDC__ ) || ( _MSC_VER <= 1200 ) +#if !defined( __BORLANDC__ ) || ( _MSC_VER < 1300 ) #else BOOST_STATIC_ASSERT(( is_same< range_value::type, int >::value )); BOOST_STATIC_ASSERT(( is_same< range_iterator::type, int* >::value )); Index: libs/regex/test/regress/test_locale.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/regex/test/regress/test_locale.cpp,v retrieving revision 1.5 diff -u -r1.5 test_locale.cpp --- libs/regex/test/regress/test_locale.cpp 28 Feb 2005 10:55:15 -0000 1.5 +++ libs/regex/test/regress/test_locale.cpp 1 Mar 2005 15:58:26 -0000 @@ -156,7 +156,7 @@ // VC6 seems to have problems with std::setlocale, I've never // gotten to the bottem of this as the program runs fine under the // debugger, but hangs when run from bjam: -#if !BOOST_WORKAROUND(BOOST_MSVC_, <=1200) && !(defined(__ICL) && defined(_MSC_VER) && (_MSC_VER == 1200)) +#if !BOOST_WORKAROUND(BOOST_MSVC_, < 1300) && !(defined(__ICL) && defined(_MSC_VER) && (_MSC_VER < 1300)) test_en_locale("en_US", 0x09 | 0x01 << 10); test_en_locale("en_UK", 0x09 | 0x02 << 10); test_en_locale("en", 0x09); Index: libs/serialization/src/basic_serializer_map.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/basic_serializer_map.cpp,v retrieving revision 1.3 diff -u -r1.3 basic_serializer_map.cpp --- libs/serialization/src/basic_serializer_map.cpp 27 Jan 2005 18:12:14 -0000 1.3 +++ libs/serialization/src/basic_serializer_map.cpp 1 Mar 2005 15:58:26 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/basic_text_iprimitive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/basic_text_iprimitive.cpp,v retrieving revision 1.3 diff -u -r1.3 basic_text_iprimitive.cpp --- libs/serialization/src/basic_text_iprimitive.cpp 27 Jan 2005 18:12:14 -0000 1.3 +++ libs/serialization/src/basic_text_iprimitive.cpp 1 Mar 2005 15:58:26 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/basic_text_oprimitive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/basic_text_oprimitive.cpp,v retrieving revision 1.3 diff -u -r1.3 basic_text_oprimitive.cpp --- libs/serialization/src/basic_text_oprimitive.cpp 27 Jan 2005 18:12:14 -0000 1.3 +++ libs/serialization/src/basic_text_oprimitive.cpp 1 Mar 2005 15:58:26 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/basic_text_wiprimitive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/basic_text_wiprimitive.cpp,v retrieving revision 1.4 diff -u -r1.4 basic_text_wiprimitive.cpp --- libs/serialization/src/basic_text_wiprimitive.cpp 27 Jan 2005 18:12:14 -0000 1.4 +++ libs/serialization/src/basic_text_wiprimitive.cpp 1 Mar 2005 15:58:26 -0000 @@ -14,7 +14,7 @@ #error "wide char i/o not supported on this platform" #else -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/basic_text_woprimitive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/basic_text_woprimitive.cpp,v retrieving revision 1.3 diff -u -r1.3 basic_text_woprimitive.cpp --- libs/serialization/src/basic_text_woprimitive.cpp 27 Jan 2005 18:12:15 -0000 1.3 +++ libs/serialization/src/basic_text_woprimitive.cpp 1 Mar 2005 15:58:26 -0000 @@ -14,7 +14,7 @@ #error "wide char i/o not supported on this platform" #else -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/polymorphic_iarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/polymorphic_iarchive.cpp,v retrieving revision 1.2 diff -u -r1.2 polymorphic_iarchive.cpp --- libs/serialization/src/polymorphic_iarchive.cpp 27 Jan 2005 18:12:15 -0000 1.2 +++ libs/serialization/src/polymorphic_iarchive.cpp 1 Mar 2005 15:58:26 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/polymorphic_oarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/polymorphic_oarchive.cpp,v retrieving revision 1.2 diff -u -r1.2 polymorphic_oarchive.cpp --- libs/serialization/src/polymorphic_oarchive.cpp 27 Jan 2005 18:12:15 -0000 1.2 +++ libs/serialization/src/polymorphic_oarchive.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/stl_port.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/stl_port.cpp,v retrieving revision 1.3 diff -u -r1.3 stl_port.cpp --- libs/serialization/src/stl_port.cpp 19 Feb 2005 21:08:02 -0000 1.3 +++ libs/serialization/src/stl_port.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/text_oarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/text_oarchive.cpp,v retrieving revision 1.3 diff -u -r1.3 text_oarchive.cpp --- libs/serialization/src/text_oarchive.cpp 27 Jan 2005 18:12:15 -0000 1.3 +++ libs/serialization/src/text_oarchive.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/void_cast.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/void_cast.cpp,v retrieving revision 1.4 diff -u -r1.4 void_cast.cpp --- libs/serialization/src/void_cast.cpp 2 Feb 2005 05:39:58 -0000 1.4 +++ libs/serialization/src/void_cast.cpp 1 Mar 2005 15:58:27 -0000 @@ -9,7 +9,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/xml_grammar.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/xml_grammar.cpp,v retrieving revision 1.4 diff -u -r1.4 xml_grammar.cpp --- libs/serialization/src/xml_grammar.cpp 27 Jan 2005 18:07:01 -0000 1.4 +++ libs/serialization/src/xml_grammar.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/xml_iarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/xml_iarchive.cpp,v retrieving revision 1.4 diff -u -r1.4 xml_iarchive.cpp --- libs/serialization/src/xml_iarchive.cpp 27 Jan 2005 18:12:15 -0000 1.4 +++ libs/serialization/src/xml_iarchive.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/xml_oarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/xml_oarchive.cpp,v retrieving revision 1.3 diff -u -r1.3 xml_oarchive.cpp --- libs/serialization/src/xml_oarchive.cpp 27 Jan 2005 18:12:15 -0000 1.3 +++ libs/serialization/src/xml_oarchive.cpp 1 Mar 2005 15:58:27 -0000 @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/src/xml_wiarchive.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/src/xml_wiarchive.cpp,v retrieving revision 1.4 diff -u -r1.4 xml_wiarchive.cpp --- libs/serialization/src/xml_wiarchive.cpp 27 Jan 2005 18:12:15 -0000 1.4 +++ libs/serialization/src/xml_wiarchive.cpp 1 Mar 2005 15:58:27 -0000 @@ -15,7 +15,7 @@ #include -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/serialization/test/test_iterators_base64.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/serialization/test/test_iterators_base64.cpp,v retrieving revision 1.4 diff -u -r1.4 test_iterators_base64.cpp --- libs/serialization/test/test_iterators_base64.cpp 10 Feb 2005 02:48:53 -0000 1.4 +++ libs/serialization/test/test_iterators_base64.cpp 1 Mar 2005 15:58:27 -0000 @@ -9,7 +9,7 @@ #include #include -#if (defined _MSC_VER) && (_MSC_VER == 1200) +#if (defined _MSC_VER) && (_MSC_VER < 1300) # pragma warning (disable : 4786) // too long name, harmless warning #endif Index: libs/spirit/fusion/test/make_tuple_tests.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/spirit/fusion/test/make_tuple_tests.cpp,v retrieving revision 1.8 diff -u -r1.8 make_tuple_tests.cpp --- libs/spirit/fusion/test/make_tuple_tests.cpp 17 Feb 2005 16:27:13 -0000 1.8 +++ libs/spirit/fusion/test/make_tuple_tests.cpp 1 Mar 2005 15:58:29 -0000 @@ -60,7 +60,7 @@ // std::make_pair("Doesn't","Work"); // fails } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) { // This test works on VC7 now, only VC6 fails // You can store a reference to a function in a tuple tuple adf(make_tuple_test); Index: libs/spirit/fusion/test/tuple_iterator_tests.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/spirit/fusion/test/tuple_iterator_tests.cpp,v retrieving revision 1.9 diff -u -r1.9 tuple_iterator_tests.cpp --- libs/spirit/fusion/test/tuple_iterator_tests.cpp 17 Feb 2005 14:44:03 -0000 1.9 +++ libs/spirit/fusion/test/tuple_iterator_tests.cpp 1 Mar 2005 15:58:29 -0000 @@ -43,7 +43,7 @@ tuple_type t(1, 'x', 3.3, s); tuple_iterator<0, tuple_type> i(t); -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) // ?%$# VC6 I don't know why this is needed! $$$LOOK$$$ //This is no longer needed... //next(i); Index: libs/utility/operators_test.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/utility/operators_test.cpp,v retrieving revision 1.13 diff -u -r1.13 operators_test.cpp --- libs/utility/operators_test.cpp 3 Feb 2005 13:41:16 -0000 1.13 +++ libs/utility/operators_test.cpp 1 Mar 2005 15:58:33 -0000 @@ -536,7 +536,7 @@ // inherited operator templates at the moment it must, so the following // explicit instantiations force it to do that. -#if defined(BOOST_MSVC) && (_MSC_VER <= 1200) +#if defined(BOOST_MSVC) && (_MSC_VER < 1300) template Wrapped1; template Wrapped1; template Wrapped1; Index: libs/variant/test/test7.cpp =================================================================== RCS file: /cvsroot/boost/boost/libs/variant/test/test7.cpp,v retrieving revision 1.6 diff -u -r1.6 test7.cpp --- libs/variant/test/test7.cpp 19 Aug 2004 15:19:17 -0000 1.6 +++ libs/variant/test/test7.cpp 1 Mar 2005 15:58:33 -0000 @@ -21,7 +21,7 @@ #include #include "boost/detail/workaround.hpp" -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) # include "boost/mpl/bool.hpp" # include "boost/type_traits/is_same.hpp" #endif @@ -154,7 +154,7 @@ { compare_helper(ValueType& expected) : expected_(expected) { } -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200) +#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) bool operator()(const ValueType& value) {