Subject: [Boost-commit] svn:boost r85920 - in trunk/boost/typeof: . msvc
From: steveire_at_[hidden]
Date: 2013-09-25 17:15:54
Author: skelly
Date: 2013-09-25 17:15:54 EDT (Wed, 25 Sep 2013)
New Revision: 85920
URL: http://svn.boost.org/trac/boost/changeset/85920
Log:
TypeOf: Remove obsolete MSVC version checks
Text files modified:
trunk/boost/typeof/msvc/typeof_impl.hpp | 32 +++-----------------------------
trunk/boost/typeof/register_fundamental.hpp | 3 +--
trunk/boost/typeof/typeof.hpp | 10 ----------
3 files changed, 4 insertions(+), 41 deletions(-)
Modified: trunk/boost/typeof/msvc/typeof_impl.hpp
==============================================================================
--- trunk/boost/typeof/msvc/typeof_impl.hpp Wed Sep 25 17:15:34 2013 (r85919)
+++ trunk/boost/typeof/msvc/typeof_impl.hpp 2013-09-25 17:15:54 EDT (Wed, 25 Sep 2013) (r85920)
@@ -15,9 +15,7 @@
# include <boost/type_traits/is_function.hpp>
# include <boost/utility/enable_if.hpp>
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1310)
-# include <typeinfo>
-# endif
+# include <typeinfo>
namespace boost
{
@@ -25,7 +23,7 @@
{
//Compile time constant code
-# if BOOST_WORKAROUND(BOOST_MSVC,>=1300) && defined(_MSC_EXTENSIONS)
+# if defined(_MSC_EXTENSIONS)
template<int N> struct the_counter;
template<typename T,int N = 5/*for similarity*/>
@@ -85,26 +83,7 @@
//Typeof code
-# if BOOST_WORKAROUND(BOOST_MSVC,==1300)
- template<typename ID>
- struct msvc_extract_type
- {
- template<bool>
- struct id2type_impl;
-
- typedef id2type_impl<true> id2type;
- };
-
- template<typename T, typename ID>
- struct msvc_register_type : msvc_extract_type<ID>
- {
- template<>
- struct id2type_impl<true> //VC7.0 specific bugfeature
- {
- typedef T type;
- };
- };
-#elif BOOST_WORKAROUND(BOOST_MSVC,>=1400)
+# if BOOST_WORKAROUND(BOOST_MSVC,>=1400)
struct msvc_extract_type_default_param {};
template<typename ID, typename T = msvc_extract_type_default_param>
@@ -189,7 +168,6 @@
{
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&);
@@ -197,10 +175,6 @@
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);
Modified: trunk/boost/typeof/register_fundamental.hpp
==============================================================================
--- trunk/boost/typeof/register_fundamental.hpp Wed Sep 25 17:15:34 2013 (r85919)
+++ trunk/boost/typeof/register_fundamental.hpp 2013-09-25 17:15:54 EDT (Wed, 25 Sep 2013) (r85920)
@@ -34,8 +34,7 @@
BOOST_TYPEOF_REGISTER_TYPE(wchar_t)
#endif
-#if (defined(BOOST_MSVC) && (BOOST_MSVC == 1200)) \
- || (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \
+#if (defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 600)) \
|| (defined(__BORLANDC__) && (__BORLANDC__ == 0x600) && (_MSC_VER == 1200))
BOOST_TYPEOF_REGISTER_TYPE(unsigned __int8)
BOOST_TYPEOF_REGISTER_TYPE(__int8)
Modified: trunk/boost/typeof/typeof.hpp
==============================================================================
--- trunk/boost/typeof/typeof.hpp Wed Sep 25 17:15:34 2013 (r85919)
+++ trunk/boost/typeof/typeof.hpp 2013-09-25 17:15:54 EDT (Wed, 25 Sep 2013) (r85920)
@@ -100,16 +100,6 @@
# define MSVC_TYPEOF_HACK
# endif
#elif defined(_MSC_VER)
-# if (_MSC_VER <= 1300) // 6.5, 7.0
-# ifndef BOOST_TYPEOF_EMULATION
-# ifndef BOOST_TYPEOF_NATIVE
-# define BOOST_TYPEOF_NATIVE
-# endif
-# include <boost/typeof/msvc/typeof_impl.hpp>
-# define MSVC_TYPEOF_HACK
-# else
-# error typeof emulation is not supported
-# endif
# elif (_MSC_VER >= 1310) // 7.1 ->
# ifndef BOOST_TYPEOF_EMULATION
# ifndef BOOST_TYPEOF_NATIVE