Index: boost/proto/generate.hpp
===================================================================
--- boost/proto/generate.hpp	(revision 60287)
+++ boost/proto/generate.hpp	(working copy)
@@ -99,7 +99,7 @@
                 /// \param expr A Proto expression
                 /// \return expr
                 template<typename Expr>
-                #ifdef BOOST_HAS_DECLTYPE
+                #ifndef BOOST_NO_DECLTYPE
                 Expr
                 #else
                 Expr const &
Index: boost/proto/traits.hpp
===================================================================
--- boost/proto/traits.hpp	(revision 60287)
+++ boost/proto/traits.hpp	(working copy)
@@ -542,7 +542,7 @@
                     /// \pre <tt>matches\<Expr, terminal\<T\> \>::::value</tt> is \c true.
                     /// \return \c e
                     /// \throw nothrow
-                    #ifdef BOOST_HAS_DECLTYPE
+                    #ifndef BOOST_NO_DECLTYPE
                     result_type
                     #else
                     typename impl::expr_param
@@ -612,7 +612,7 @@
                     /// \pre <tt>matches\<Expr, nullary_expr\<Tag, T\> \>::::value</tt> is \c true.
                     /// \return \c e
                     /// \throw nothrow
-                    #ifdef BOOST_HAS_DECLTYPE
+                    #ifndef BOOST_NO_DECLTYPE
                     result_type
                     #else
                     typename impl::expr_param
Index: boost/proto/extends.hpp
===================================================================
--- boost/proto/extends.hpp	(revision 60287)
+++ boost/proto/extends.hpp	(working copy)
@@ -357,7 +357,7 @@
         };                                                                                          \
         /**/
 
-    #ifdef BOOST_HAS_VARIADIC_TMPL
+    #ifndef BOOST_NO_VARIADIC_TEMPLATES
         #define BOOST_PROTO_EXTENDS_FUNCTION_CONST()                                                \
             BOOST_PROTO_EXTENDS_FUNCTION_()                                                         \
             BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1)                                             \
@@ -473,7 +473,7 @@
             // the operator() overloads, which is more efficient.
             BOOST_PROTO_EXTENDS_FUNCTION_()
 
-        #ifdef BOOST_HAS_VARIADIC_TMPL
+        #ifndef BOOST_NO_VARIADIC_TEMPLATES
             BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1)
         #else
             /// INTERNAL ONLY
@@ -516,7 +516,7 @@
             // the operator() overloads, which is more efficient.
             BOOST_PROTO_EXTENDS_FUNCTION_()
 
-        #ifdef BOOST_HAS_VARIADIC_TMPL
+        #ifndef BOOST_NO_VARIADIC_TEMPLATES
             BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(0)
             BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1)
         #else
Index: boost/proto/detail/decltype.hpp
===================================================================
--- boost/proto/detail/decltype.hpp	(revision 60287)
+++ boost/proto/detail/decltype.hpp	(working copy)
@@ -35,7 +35,7 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/proto/repeat.hpp>
 
-#ifdef BOOST_HAS_DECLTYPE
+#ifndef BOOST_NO_DECLTYPE
 # define BOOST_PROTO_DECLTYPE_(EXPR, TYPE) typedef decltype(EXPR) TYPE;
 #else
 # define BOOST_PROTO_DECLTYPE_NESTED_TYPEDEF_TPL_(NESTED, EXPR)                                     \
Index: boost/proto/matches.hpp
===================================================================
--- boost/proto/matches.hpp	(revision 60287)
+++ boost/proto/matches.hpp	(working copy)
@@ -570,7 +570,7 @@
 
                     /// \param expr An expression
                     /// \return \c e
-                    #ifdef BOOST_HAS_DECLTYPE
+                    #ifndef BOOST_NO_DECLTYPE
                     result_type
                     #else
                     typename impl::expr_param 
@@ -609,7 +609,7 @@
                     /// \param e An expression
                     /// \pre <tt>matches\<Expr,not_\>::::value</tt> is \c true.
                     /// \return \c e
-                    #ifdef BOOST_HAS_DECLTYPE
+                    #ifndef BOOST_NO_DECLTYPE
                     result_type
                     #else
                     typename impl::expr_param 
Index: boost/proto/transform/arg.hpp
===================================================================
--- boost/proto/transform/arg.hpp	(revision 60287)
+++ boost/proto/transform/arg.hpp	(working copy)
@@ -38,7 +38,7 @@
             /// \param e The current expression.
             /// \return \c e
             /// \throw nothrow
-            #ifdef BOOST_HAS_DECLTYPE
+            #ifndef BOOST_NO_DECLTYPE
             result_type
             #else
             typename impl::expr_param 
@@ -75,7 +75,7 @@
             /// \param s The current state.
             /// \return \c s
             /// \throw nothrow
-            #ifdef BOOST_HAS_DECLTYPE
+            #ifndef BOOST_NO_DECLTYPE
             result_type
             #else
             typename impl::state_param 
@@ -113,7 +113,7 @@
             /// \param d The current data.
             /// \return \c d
             /// \throw nothrow
-            #ifdef BOOST_HAS_DECLTYPE
+            #ifndef BOOST_NO_DECLTYPE
             result_type
             #else
             typename impl::data_param 
@@ -154,7 +154,7 @@
             /// \param e The current expression.
             /// \return <tt>proto::child_c\<N\>(e)</tt>
             /// \throw nothrow
-            #ifdef BOOST_HAS_DECLTYPE
+            #ifndef BOOST_NO_DECLTYPE
             result_type
             #else
             typename result_of::child_c<typename impl::expr_param, N>::type
@@ -194,7 +194,7 @@
             /// \param e The current expression.
             /// \return <tt>proto::value(e)</tt>
             /// \throw nothrow
-            #ifdef BOOST_HAS_DECLTYPE
+            #ifndef BOOST_NO_DECLTYPE
             typename mpl::if_c<is_array<result_type>::value, result_type &, result_type>::type
             #else
             typename result_of::value<typename impl::expr_param>::type
Index: boost/proto/transform/pass_through.hpp
===================================================================
--- boost/proto/transform/pass_through.hpp	(revision 60287)
+++ boost/proto/transform/pass_through.hpp	(working copy)
@@ -67,7 +67,7 @@
                 /// \param e An expression
                 /// \return \c e
                 /// \throw nothrow
-                #ifdef BOOST_HAS_DECLTYPE
+                #ifndef BOOST_NO_DECLTYPE
                 result_type
                 #else
                 typename pass_through_impl::expr_param