summaryrefslogtreecommitdiff
path: root/boost/typeof
diff options
context:
space:
mode:
Diffstat (limited to 'boost/typeof')
-rw-r--r--boost/typeof/std/functional.hpp6
-rw-r--r--boost/typeof/std/memory.hpp2
-rw-r--r--boost/typeof/typeof.hpp3
3 files changed, 10 insertions, 1 deletions
diff --git a/boost/typeof/std/functional.hpp b/boost/typeof/std/functional.hpp
index f1b157764e..6d3d00d31e 100644
--- a/boost/typeof/std/functional.hpp
+++ b/boost/typeof/std/functional.hpp
@@ -10,8 +10,10 @@
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
+#ifndef BOOST_NO_CXX98_FUNCTION_BASE
BOOST_TYPEOF_REGISTER_TEMPLATE(std::unary_function, 2)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::binary_function, 3)
+#endif//BOOST_NO_CXX98_FUNCTION_BASE
BOOST_TYPEOF_REGISTER_TEMPLATE(std::plus, 1)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::minus, 1)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::multiplies, 1)
@@ -30,6 +32,8 @@ BOOST_TYPEOF_REGISTER_TEMPLATE(std::logical_not, 1)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::unary_negate, 1)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::binary_negate, 1)
+#ifndef BOOST_NO_CXX98_BINDERS
+
#if defined(__MWERKS__) && defined(_MSL_EXTENDED_BINDERS)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder1st, 2)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::binder2nd, 2)
@@ -52,4 +56,6 @@ BOOST_TYPEOF_REGISTER_TEMPLATE(std::mem_fun1_ref_t, 3)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::const_mem_fun1_ref_t, 3)
#endif//BOOST_WORKAROUND(BOOST_DINKUMWARE_STDLIB, == 1)
+#endif//BOOST_NO_CXX98_BINDERS
+
#endif//BOOST_TYPEOF_STD_functional_hpp_INCLUDED
diff --git a/boost/typeof/std/memory.hpp b/boost/typeof/std/memory.hpp
index fa3ae1da4d..ad4c2c1943 100644
--- a/boost/typeof/std/memory.hpp
+++ b/boost/typeof/std/memory.hpp
@@ -12,6 +12,8 @@
BOOST_TYPEOF_REGISTER_TEMPLATE(std::allocator, 1)
BOOST_TYPEOF_REGISTER_TEMPLATE(std::raw_storage_iterator, 2)
+#ifndef BOOST_NO_AUTO_PTR
BOOST_TYPEOF_REGISTER_TEMPLATE(std::auto_ptr, 1)
+#endif//BOOST_NO_AUTO_PTR
#endif//BOOST_TYPEOF_STD_memory_hpp_INCLUDED
diff --git a/boost/typeof/typeof.hpp b/boost/typeof/typeof.hpp
index 1efa3dc8c4..d2c49fbcc1 100644
--- a/boost/typeof/typeof.hpp
+++ b/boost/typeof/typeof.hpp
@@ -14,8 +14,9 @@
#endif
#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
-#if !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_TYPEOF_EMULATION)
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1900) && !defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_TYPEOF_EMULATION)
# define BOOST_TYPEOF_DECLTYPE
# ifndef BOOST_TYPEOF_NATIVE
# define BOOST_TYPEOF_NATIVE