Branch for development of boost.system related changes

[SVN r40931]

include/boost/typeof/msvc/typeof_impl.hpp

@@ -104,7 +104,7 @@ namespace boost
                 typedef T type;
             };
         };
-#elif BOOST_WORKAROUND(BOOST_MSVC,>=1400)
+#elif BOOST_WORKAROUND(BOOST_MSVC,==1400)
         struct msvc_extract_type_default_param {};
 
         template<typename ID, typename T = msvc_extract_type_default_param>
@@ -153,7 +153,7 @@ namespace boost
             };
         };
 # endif
-# if BOOST_WORKAROUND(BOOST_MSVC,==1310)
+# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
         template<const std::type_info& ref_type_info>
         struct msvc_typeid_wrapper {
             typedef typename msvc_extract_type<msvc_typeid_wrapper>::id2type id2type;
@@ -184,7 +184,6 @@ namespace boost
         template<typename Organizer, typename T>
         msvc_register_type<T,Organizer> typeof_register_type(const T&);
 
-
 # define BOOST_TYPEOF(expr) \
     boost::type_of::msvc_typeid_wrapper<typeid(boost::type_of::encode_start(expr))>::type
 
@@ -240,18 +239,10 @@ struct name {\
         {
             typedef char(*type)[encode_type<T>::value];
         };
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
-        template<typename T> typename disable_if<
-            typename is_function<T>::type,
-            typename sizer<T>::type>::type encode_start(T const&);
 
-        template<typename T> typename enable_if<
-            typename is_function<T>::type,
-            typename sizer<T>::type>::type encode_start(T&);
-# else
         template<typename T>
             typename sizer<T>::type encode_start(T const&);
-# endif
+
         template<typename Organizer, typename T>
         msvc_register_type<T,Organizer> typeof_register_type(const T&,Organizer* =0);
 

tools/preprocess.pl

@@ -1,7 +1,7 @@
 # // (C) Copyright Tobias Schwinger
 # //
 # // Use modification and distribution are subject to the boost Software License
-# // Version 1.0. (See http://www.boost.org/LICENSE_1_0.txt).
+# // Version 1.0. (See http:/\/www.boost.org/LICENSE_1_0.txt).
 
 # // Preprocess and run this script.
 # //