From 1c37e1a99461c8becc06bbb9fe0cf97f264d86fd Mon Sep 17 00:00:00 2001 From: Eric Niebler Date: Wed, 1 Jun 2011 14:51:03 +0000 Subject: [PATCH] add BOOST_NO_DECLTYPE_N3276 config macro [SVN r72327] --- doc/html/boost_config/acknowledgements.html | 7 +- .../boost_config/boost_macro_reference.html | 131 +++++++++-------- .../guidelines_for_boost_authors.html | 73 +++++----- doc/html/boost_config/rationale.html | 11 +- doc/html/index.html | 45 +++--- doc/macro_reference.qbk | 6 +- include/boost/config/compiler/borland.hpp | 1 + include/boost/config/compiler/clang.hpp | 1 + include/boost/config/compiler/common_edg.hpp | 1 + include/boost/config/compiler/digitalmars.hpp | 1 + include/boost/config/compiler/gcc.hpp | 4 + include/boost/config/compiler/gcc_xml.hpp | 1 + include/boost/config/compiler/hp_acc.hpp | 1 + include/boost/config/compiler/metrowerks.hpp | 1 + include/boost/config/compiler/mpw.hpp | 1 + include/boost/config/compiler/pathscale.hpp | 1 + include/boost/config/compiler/pgi.hpp | 1 + include/boost/config/compiler/sunpro_cc.hpp | 1 + include/boost/config/compiler/vacpp.hpp | 1 + include/boost/config/compiler/visualc.hpp | 1 + include/boost/config/suffix.hpp | 7 + test/all/Jamfile.v2 | 5 +- test/boost_no_decltype_n3276.ipp | 137 ++++++++++++++++++ test/config_info.cpp | 5 + test/config_test.cpp | 12 +- test/no_decltype_n3276_fail.cpp | 37 +++++ test/no_decltype_n3276_pass.cpp | 37 +++++ tools/generate.cpp | 4 +- 28 files changed, 405 insertions(+), 129 deletions(-) create mode 100644 test/boost_no_decltype_n3276.ipp create mode 100644 test/no_decltype_n3276_fail.cpp create mode 100644 test/no_decltype_n3276_pass.cpp diff --git a/doc/html/boost_config/acknowledgements.html b/doc/html/boost_config/acknowledgements.html index 95301d82..f8143ae3 100644 --- a/doc/html/boost_config/acknowledgements.html +++ b/doc/html/boost_config/acknowledgements.html @@ -3,7 +3,7 @@ Acknowledgements - + @@ -21,7 +21,7 @@
PrevUpHome
-
+
@@ -47,7 +47,8 @@
- @@ -1324,12 +1324,12 @@
Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock

+

Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John + Maddock

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_config/boost_macro_reference.html b/doc/html/boost_config/boost_macro_reference.html index 2e1a86ad..806bc110 100644 --- a/doc/html/boost_config/boost_macro_reference.html +++ b/doc/html/boost_config/boost_macro_reference.html @@ -3,7 +3,7 @@ Boost Macro Reference - + @@ -22,7 +22,7 @@
PrevUpHomeNext
-
+
@@ -42,12 +42,12 @@
Macros for libraries with separate source code
-
+
-

+

The following macros all describe features that are required by the C++ standard, if one of the following macros is defined, then it represents a defect in the compiler's conformance with the standard. @@ -422,16 +422,16 @@ The compiler does not perform function template ordering or its function template ordering is incorrect.

-
// #1
-template<class T> void f(T);
+
// #1
+template<class T> void f(T);
 
-// #2
-template<class T,class U> void f(T(*)(U));
+// #2
+template<class T,class U> void f(T(*)(U));
 
 void bar(int);
 
-f(&bar); // should choose #2.
-

+f(&bar); // should choose #2.
+
-
+
-

+

The following macros describe features that are not required by the C++ standard. The macro is only defined if the feature is present.

@@ -2216,7 +2216,7 @@
-
+
-
+

Macros that describe C++0x features not supported @@ -2593,6 +2593,20 @@ + +

+ BOOST_NO_DECLTYPE_N3276 +

+ + +

+ The compiler does not support the extension to decltype + described in N3276, + accepted in Madrid, March 2011. +

+ + +

BOOST_NO_DEFAULTED_FUNCTIONS @@ -2714,7 +2728,7 @@

- The compiler does not support 'nullptr'. + The compiler does not support nullptr.

@@ -2844,12 +2858,12 @@

-
+
-

+

The following macros are either simple helpers, or macros that provide workarounds for compiler/standard library defects.

@@ -2889,10 +2903,10 @@ usage is then: 

#if BOOST_WORKAROUND(MACRONAME, CONDITION)
-   // workaround code goes here...
-#else
-   // Standard conforming code goes here...
-#endif
+   // workaround code goes here...
+#else
+   // Standard conforming code goes here...
+#endif

where MACRONAME @@ -3277,12 +3291,12 @@

-
+
-

+

The following macros describe boost features; these are, generally speaking the only boost macros that should be tested in user code.

@@ -3555,7 +3569,7 @@
-
+

Macros for libraries with separate source code @@ -3572,14 +3586,14 @@ The following macros and helper headers are of use to authors whose libraries include separate source code, and are intended to address several issues:

-
    -
  • +
      +
    • Controlling shared library symbol visibility
      • -
    • +
    • Fixing the ABI of the compiled library
      • -
    • +
    • Selecting which compiled library to link against based upon the compilers settings
      • @@ -3588,7 +3602,7 @@ See Guidelines for Authors of Boost Libraries Containing Separate Source

      -
      +
      -
      +

      ABI Fixing @@ -3771,28 +3785,28 @@ 
      #ifndef MY_INCLUDE_GUARD
 #define MY_INCLUDE_GUARD
 
-// all includes go here:
-#include <boost/config.hpp>
+// all includes go here:
+#include <boost/config.hpp>
 #include <whatever>
 
-#include <boost/config/abi_prefix.hpp> // must be the last #include
-
+#include <boost/config/abi_prefix.hpp> // must be the last #include
+
 namespace boost {
 
-// your code goes here
-
+// your code goes here
+
 }
 
-#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
-
-#endif // include guard
-
      +#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas + +#endif // include guard +

      my_library.cpp 

      ...
-// nothing special need be done in the implementation file
-...
+// nothing special need be done in the implementation file
+...

      The user can disable this mechanism by defining BOOST_DISABLE_ABI_HEADERS, @@ -3801,7 +3815,7 @@ to point to their own prefix/suffix headers if they so wish.

      -
      +

      Automatic library selection @@ -3856,12 +3870,12 @@ my_library.hpp 

      ...
-//
-// Don't include auto-linking code if the user has disabled it by
-// defining BOOST_ALL_NO_LIB, or BOOST_MY_LIBRARY_NO_LIB, or if this 
-// is one of our own source files (signified by BOOST_MY_LIBRARY_SOURCE):
-//
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_MY_LIBRARY_NO_LIB) && !defined(BOOST_MY_LIBRARY_SOURCE)
+//
+// Don't include auto-linking code if the user has disabled it by
+// defining BOOST_ALL_NO_LIB, or BOOST_MY_LIBRARY_NO_LIB, or if this 
+// is one of our own source files (signified by BOOST_MY_LIBRARY_SOURCE):
+//
+#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_MY_LIBRARY_NO_LIB) && !defined(BOOST_MY_LIBRARY_SOURCE)
 #  define BOOST_LIB_NAME boost_my_library
 #  ifdef BOOST_MY_LIBRARY_DYN_LINK
 #     define BOOST_DYN_LINK
@@ -3873,10 +3887,10 @@
 
      
           my_library.cpp
         
      
-
      // define BOOST_MY_LIBRARY_SOURCE so that the header knows that the
-// library is being built (possibly exporting rather than importing code)
-//
-#define BOOST_MY_LIBRARY_SOURCE
+
      // define BOOST_MY_LIBRARY_SOURCE so that the header knows that the
+// library is being built (possibly exporting rather than importing code)
+//
+#define BOOST_MY_LIBRARY_SOURCE
 
 #include <boost/my_library/my_library.hpp>
 ...
@@ -3886,7 +3900,8 @@

      -
      Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock

      +

      Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John + Maddock

      Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

      diff --git a/doc/html/boost_config/guidelines_for_boost_authors.html b/doc/html/boost_config/guidelines_for_boost_authors.html index d429863e..1079480d 100644 --- a/doc/html/boost_config/guidelines_for_boost_authors.html +++ b/doc/html/boost_config/guidelines_for_boost_authors.html @@ -3,7 +3,7 @@ Guidelines for Boost Authors - + @@ -22,7 +22,7 @@
      PrevUpHomeNext
      -
      +

      Guidelines for Boost Authors @@ -61,26 +61,26 @@

      Note that:

      -
        -
      • +
          +
        • Boost library implementers are not required to "#include <boost/config.hpp>", and are not required in any way to support compilers that do not comply with the C++ Standard (ISO/IEC 14882).
          • -
        • +
        • If a library implementer wishes to support some non-conforming compiler, or to support some platform specific feature, "#include <boost/config.hpp>" is the preferred way to obtain configuration information not available from the standard headers such as <climits>, etc.
          • -
        • +
        • If configuration information can be deduced from standard headers such as <climits>, use those standard headers rather than <boost/config.hpp>.
          • -
        • +
        • Boost files that use macros defined in <boost/config.hpp> should have sensible, standard conforming, default behavior if the macro is not defined. This means that the starting point for porting <boost/config.hpp> to a new platform is simply to define @@ -88,22 +88,22 @@ is no sensible default behavior, an #error message should describe the problem.
          • -
        • +
        • If a Boost library implementer wants something added to config.hpp, post a request on the Boost mailing list. There is no guarantee such a request will be honored; the intent is to limit the complexity of config.hpp.
          • -
        • +
        • The intent is to support only compilers which appear on their way to becoming C++ Standard compliant, and only recent releases of those compilers at that.
          • -
        • +
        • The intent is not to disable mainstream features now well-supported by the majority of compilers, such as namespaces, exceptions, RTTI, or templates.
        -
        +

        Disabling Compiler Warnings @@ -116,17 +116,17 @@

        Note that:

        -
          -
        • +
            +
          • This header should never be included by another Boost header, it should only ever be used by a library source file or a test case.
            • -
          • +
          • The header should be included before you include any other header.
            • -
          • +
          • This header only disables warnings that are hard or impossible to otherwise deal with, and which are typically emitted by one compiler only, or in one compilers own standard library headers. @@ -182,7 +182,7 @@

      -
      +

      Adding New Defect Macros @@ -206,10 +206,10 @@ the test case in a .ipp file with the following comments near the top:

      -
      //  MACRO:         BOOST_NO_FOO
-//  TITLE:         foo
-//  DESCRIPTION:   If the compiler fails to support foo
-
      +
      //  MACRO:         BOOST_NO_FOO
+//  TITLE:         foo
+//  DESCRIPTION:   If the compiler fails to support foo
+

      These comments are processed by the autoconf script, so make sure the format follows the one given. The file should be named "boost_no_foo.ipp", @@ -222,9 +222,9 @@ 

      namespace boost_no_foo {
 int test()
 {
-    // test code goes here:
-    //
-    return 0;
+    // test code goes here:
+    //
+    return 0;
 }
 
 }
@@ -233,15 +233,15 @@
         Once the test code is in place in libs/config/test, updating the configuration
         test system proceeds as:
       
      
-
        
-
      • 
+
          
+
        • 
             cd into libs/config/tools and run bjam.
             This generates the .cpp
             file test cases from the .ipp file, updates the libs/config/test/all/Jamfile.v2,
             config_test.cpp and config_info.cpp.
          
             
          
           
          • 
-
        • 
+
        • 
             cd into libs/config/test/all and run bjam
             MACRONAME compiler-list,
             where MACRONAME is the name of the new macro, and
@@ -253,7 +253,7 @@
             is defined when it should not be defined, xxx_fail_test will not report
             **passed**.
           
          
           
          • 
-
        • 
+
        • 
             cd into libs/config/test and run bjam
             config_info config_test
             compiler-list.
@@ -266,26 +266,26 @@
 
          
         Then you should:
       
          
-
            
-
          • 
+
              
+
            • 
             Define the defect macro in those config headers that require it.
           
              • 
-
            • 
+
            • 
             Document the macro in this documentation (please do not forget this step!!)
           
              • 
-
            • 
+
            • 
             Commit everything.
           
              • 
-
            • 
+
            • 
             Keep an eye on the regression tests for new failures in Boost.Config
             caused by the addition.
           
              • 
-
            • 
+
            • 
             Start using the macro.
           
              • 
 
            
 
          
-
          
+
          
 
          
 Adding
       New Feature Test Macros
@@ -309,7 +309,7 @@
         <unistd.h>).
       
          
 
          
-
          
+
          
 
          
 
-
          
 
          Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock
          
+
          Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock
          
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
          
diff --git a/doc/html/boost_config/rationale.html b/doc/html/boost_config/rationale.html
index e073e213..f92d7993 100644
--- a/doc/html/boost_config/rationale.html
+++ b/doc/html/boost_config/rationale.html
@@ -3,7 +3,7 @@
 
 Rationale
 
-
+
 
 
 
@@ -22,7 +22,7 @@
 
          
 PrevUpHomeNext
 
          
-
          
+
          
 
          
@@ -39,7 +39,7 @@
       principles from the following
       article.
     
          
-
          
+
          
 
          
@@ -90,7 +90,7 @@
         code must be provided.
       
          
 
          
-
          
+
          
 
          
@@ -109,7 +109,8 @@
 
          
 
-
          
 
          Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock
          
+
          Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock
          
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
          
diff --git a/doc/html/index.html b/doc/html/index.html
index 98066758..9c2bee38 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -3,7 +3,7 @@
 
 Boost.Config
 
-
+
 
 
 
@@ -18,7 +18,7 @@
 
          
 
          
 
          Next
          
-
          
+
          
 
          
 
          
 
          
@@ -26,9 +26,10 @@
 
          
 Vesa Karvonen, John Maddock Beman Dawes
 
          
-
          Copyright © 2001 -2007 Beman Dawes, Vesa Karvonen, John Maddock
          
+
          Copyright © 2001-2007 Beman Dawes, Vesa Karvonen, John
+      Maddock
          
 
          
-
          
+
          
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       
          
@@ -92,7 +93,7 @@
 
          Acknowledgements
          
 
 
          
-
          
+
          
 
          
-
          
+
          
 
          
 Using
       the default boost configuration
@@ -135,7 +136,7 @@
         and submitting a support request.
       
          
 
          
-
          
+
          
 
          
 The
       <boost/config.hpp> header
@@ -166,12 +167,12 @@
         developers list.
       
          
 
          
-
          
+
          
 
          
-
          
+
          
@@ -287,15 +288,15 @@
         (located under <boost-root>/boost/config/).
         There are two ways you can use this header:
       
          
-
            
-
          • 
+
              
+
            • 
             Option 1: copy the header into <boost-root>/boost/config/ so that it replaces the default user.hpp
             provided by boost. This option allows only one configure-generated setup;
             boost developers should avoid this option, as it incurs the danger of
             accidentally committing a configure-modified <boost/config/user.hpp>
             to the cvs repository (something you will not be thanked for!).
           
              • 
-
            • 
+
            • 
             Option 2: give the header a more memorable
             name, and place it somewhere convenient; then, define the macro BOOST_USER_CONFIG to point to it. For
             example create a new sub-directory <boost-root>/boost/config/ user/, and copy the header there; for example
@@ -308,12 +309,12 @@
           
              • 
 
            
 
          
-
          
+
          
 
          
-
          
+
          
         There are some configuration-options that represent user choices, rather
         than compiler defects or platform specific options. These are listed in
         <boost/config/user.hpp>
@@ -674,7 +675,7 @@
 
          
 
          
 [Important]
 Important
          
 
          
 
          
-
          
+
          
 
          
 Advanced
       configuration usage
@@ -718,7 +719,7 @@
 
          
         The following usage examples represent just a few of the possibilities:
       
          
-
          
+
          
 
          
 Example
         1, creating our own frozen configuration
@@ -750,7 +751,7 @@
           yet supported by boost.
         
          
 
          
-
          
+
          
 
          
 Example
         2: skipping files that you don't need
@@ -769,7 +770,7 @@
           a dependency on two boost headers.
         
          
 
          
-
          
+
          
 
          
-
          
+
          
 
          
 Testing
       the boost configuration
@@ -946,7 +947,7 @@
 
          
 
          
 
-
+
          Last revised: May 09, 2011 at 11:33:33 GMT
          Last revised: June 01, 2011 at 14:31:32 GMT
          		
 
          		
 
          
 
          
diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk
index d726d308..f319f595 100644
--- a/doc/macro_reference.qbk
+++ b/doc/macro_reference.qbk
@@ -575,6 +575,10 @@ type `char32_t`.
 [[`BOOST_NO_DECLTYPE`][The compiler does not support 
 `decltype`. 
 ]]                       
+[[`BOOST_NO_DECLTYPE_N3276`][The compiler does not support the extension to
+`decltype` described in [@http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3276.pdf N3276],
+accepted in Madrid, March 2011.
+]]                       
 [[`BOOST_NO_DEFAULTED_FUNCTIONS`][The compiler does not support 
 defaulted (`= default`) functions.  
 ]]            
@@ -599,7 +603,7 @@ The C++ compiler does not support C++0x initializer lists.
 ]]                
 [[`BOOST_NO_NOEXCEPT`][The compiler does not support `noexcept`. 
 ]]                      
-[[`BOOST_NO_NULLPTR`][The compiler does not support 'nullptr'. 
+[[`BOOST_NO_NULLPTR`][The compiler does not support `nullptr`. 
 ]]                      
 [[`BOOST_NO_RAW_LITERALS`][The compiler does not support
 raw string literals. 
diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp
index 60f55055..680e87bd 100644
--- a/include/boost/config/compiler/borland.hpp
+++ b/include/boost/config/compiler/borland.hpp
@@ -172,6 +172,7 @@
 #define BOOST_NO_AUTO_DECLARATIONS
 #define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 623452cd..9f4adf82 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -35,6 +35,7 @@
 #  define BOOST_NO_DECLTYPE
 #endif
 
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 
 #if !__has_feature(cxx_deleted_functions)
diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp
index c98c4751..10333ad2 100644
--- a/include/boost/config/compiler/common_edg.hpp
+++ b/include/boost/config/compiler/common_edg.hpp
@@ -76,6 +76,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp
index 27d6b8e4..ed92306f 100644
--- a/include/boost/config/compiler/digitalmars.hpp
+++ b/include/boost/config/compiler/digitalmars.hpp
@@ -66,6 +66,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp
index 90db8c56..5a69cb49 100644
--- a/include/boost/config/compiler/gcc.hpp
+++ b/include/boost/config/compiler/gcc.hpp
@@ -217,6 +217,10 @@
 #define BOOST_NO_UNIFIED_INITIALIZATION_SYNTAX
 #endif
 
+// C++0x features not supported at all yet
+//
+#define BOOST_NO_DECLTYPE_N3276
+
 #ifndef BOOST_COMPILER
 #  define BOOST_COMPILER "GNU C++ version " __VERSION__
 #endif
diff --git a/include/boost/config/compiler/gcc_xml.hpp b/include/boost/config/compiler/gcc_xml.hpp
index 54a9ae1b..61dcedcc 100644
--- a/include/boost/config/compiler/gcc_xml.hpp
+++ b/include/boost/config/compiler/gcc_xml.hpp
@@ -31,6 +31,7 @@
 #  define BOOST_NO_NULLPTR
 #  define BOOST_NO_TEMPLATE_ALIASES
 #  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_DECLTYPE_N3276
 #  define BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS
 #  define BOOST_NO_RVALUE_REFERENCES
 #  define BOOST_NO_STATIC_ASSERT
diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp
index cc0c0af5..0d73b287 100644
--- a/include/boost/config/compiler/hp_acc.hpp
+++ b/include/boost/config/compiler/hp_acc.hpp
@@ -98,6 +98,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp
index fb0401fe..02baecdd 100644
--- a/include/boost/config/compiler/metrowerks.hpp
+++ b/include/boost/config/compiler/metrowerks.hpp
@@ -98,6 +98,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp
index e372f093..45e1aa45 100644
--- a/include/boost/config/compiler/mpw.hpp
+++ b/include/boost/config/compiler/mpw.hpp
@@ -46,6 +46,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/pathscale.hpp b/include/boost/config/compiler/pathscale.hpp
index 5f9444c4..94e44726 100644
--- a/include/boost/config/compiler/pathscale.hpp
+++ b/include/boost/config/compiler/pathscale.hpp
@@ -52,6 +52,7 @@
 #  define BOOST_NO_DELETED_FUNCTIONS
 #  define BOOST_NO_DEFAULTED_FUNCTIONS
 #  define BOOST_NO_DECLTYPE
+#  define BOOST_NO_DECLTYPE_N3276
 #  define BOOST_NO_CONSTEXPR
 #  define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
 #  define BOOST_NO_CHAR32_T
diff --git a/include/boost/config/compiler/pgi.hpp b/include/boost/config/compiler/pgi.hpp
index 3c803133..6da0e0f4 100644
--- a/include/boost/config/compiler/pgi.hpp
+++ b/include/boost/config/compiler/pgi.hpp
@@ -53,6 +53,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp
index 206b53f0..eaf6c741 100644
--- a/include/boost/config/compiler/sunpro_cc.hpp
+++ b/include/boost/config/compiler/sunpro_cc.hpp
@@ -105,6 +105,7 @@
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_DECLTYPE
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp
index 52500202..b0407aab 100644
--- a/include/boost/config/compiler/vacpp.hpp
+++ b/include/boost/config/compiler/vacpp.hpp
@@ -84,6 +84,7 @@
 #else
 #  define BOOST_HAS_DECLTYPE
 #endif
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp
index d2dfa7ef..b9c81757 100644
--- a/include/boost/config/compiler/visualc.hpp
+++ b/include/boost/config/compiler/visualc.hpp
@@ -194,6 +194,7 @@
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONSTEXPR
+#define BOOST_NO_DECLTYPE_N3276
 #define BOOST_NO_DEFAULTED_FUNCTIONS
 #define BOOST_NO_DELETED_FUNCTIONS
 #define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp
index 30622872..7e5d4d4d 100644
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -359,6 +359,13 @@
 #define BOOST_HAS_VARIADIC_TMPL
 #endif
 
+//
+// Set BOOST_NO_DECLTYPE_N3276 when BOOST_NO_DECLTYPE is defined
+//
+#if !defined(BOOST_NO_DECLTYPE_N3276) && defined(BOOST_NO_DECLTYPE)
+#define BOOST_NO_DECLTYPE_N3276
+#endif
+
 //  BOOST_HAS_ABI_HEADERS
 //  This macro gets set if we have headers that fix the ABI,
 //  and prevent ODR violations when linking to external libraries:
diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2
index 3fbdf07a..8f138e9d 100644
--- a/test/all/Jamfile.v2
+++ b/test/all/Jamfile.v2
@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Mon May 09 12:11:18 2011
+# This file was automatically generated on Wed Jun  1 21:44:56 2011
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -277,6 +277,9 @@ test-suite "BOOST_NO_CWCTYPE" :
 test-suite "BOOST_NO_DECLTYPE" : 
 [ run ../no_decltype_pass.cpp ]
 [ compile-fail ../no_decltype_fail.cpp ] ;
+test-suite "BOOST_NO_DECLTYPE_N3276" : 
+[ run ../no_decltype_n3276_pass.cpp ]
+[ compile-fail ../no_decltype_n3276_fail.cpp ] ;
 test-suite "BOOST_DEDUCED_TYPENAME" : 
 [ run ../no_ded_typename_pass.cpp ]
 [ compile-fail ../no_ded_typename_fail.cpp ] ;
diff --git a/test/boost_no_decltype_n3276.ipp b/test/boost_no_decltype_n3276.ipp
new file mode 100644
index 00000000..f0c3688b
--- /dev/null
+++ b/test/boost_no_decltype_n3276.ipp
@@ -0,0 +1,137 @@
+
+//  (C) Copyright Eric Niebler 2011
+
+//  Use, modification and distribution are subject to the
+//  Boost Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for more information.
+
+//  MACRO:         BOOST_NO_DECLTYPE_N3276
+//  TITLE:         C++0x decltype v1.1 unavailable
+//  DESCRIPTION:   The compiler does not support extensions to C++0x
+//                 decltype as described in N3276 and accepted in Madrid,
+//                 March 2011:
+//                 
+
+namespace boost_no_decltype_n3276 {
+
+// A simplified result_of implementation.
+// that uses decltype.
+template
+struct result_of;
+
+template
+T& declvar();
+
+// use decltype
+template
+struct result_of
+{
+    typedef decltype(declvar()(declvar())) type;
+};
+
+template
+struct result_of
+{
+    typedef decltype(declvar()(declvar(), declvar())) type;
+};
+
+// simple tuple type
+template
+struct tuple;
+
+template
+struct tuple
+{
+    A0 a0_;
+
+    tuple(A0 const &a0)
+      : a0_(a0)
+    {}
+};
+
+template
+struct tuple
+{
+    A0 a0_;
+    A1 a1_;
+
+    tuple(A0 const &a0, A1 const & a1)
+      : a0_(a0)
+      , a1_(a1)
+    {}
+};
+
+// A node in an expression tree
+template // Args is a tuple.
+struct Expr;
+
+// A function object that builds expression nodes
+template
+struct MakeExpr
+{
+    template
+    Expr > operator()(T const & t) const
+    {
+        return Expr >(tuple(t));
+    }
+
+    template
+    Expr > operator()(T const & t, U const & u) const
+    {
+        return Expr >(tuple(t, u));
+    }
+};
+
+// Here are tag types that encode in an expression node
+// what operation created the node.
+struct Terminal;
+struct BinaryPlus;
+struct FunctionCall;
+
+typedef MakeExpr MakeTerminal;
+typedef MakeExpr MakeBinaryPlus;
+typedef MakeExpr MakeFunctionCall;
+
+template
+struct Expr
+{
+    Args args_;
+
+    explicit Expr(Args const & t) : args_(t) {}
+
+    // An overloaded operator+ that creates a binary plus node
+    template
+    typename result_of)>::type
+    operator+(Expr const &right) const
+    {
+        return MakeBinaryPlus()(*this, right);
+    }
+
+    // An overloaded function call operator that creates a unary
+    // function call node
+    typename result_of::type
+    operator()() const
+    {
+        return MakeFunctionCall()(*this);
+    }
+};
+
+int test()
+{
+    // This is a terminal in an expression tree
+    Expr > i = MakeTerminal()(42);
+
+    i + i; // OK, this creates a binary plus node.
+
+    i(); // OK, this creates a unary function-call node.
+         // NOTE: If N3276 has not been implemented, this
+         // line will set off an infinite cascade of template
+         // instantiations that will run the compiler out of
+         // memory.
+
+    return 0;
+}
+
+}
diff --git a/test/config_info.cpp b/test/config_info.cpp
index f945fcaf..eece2e19 100644
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@@ -996,6 +996,7 @@ void print_boost_macros()
    PRINT_MACRO(BOOST_NO_CWCHAR);
    PRINT_MACRO(BOOST_NO_CWCTYPE);
    PRINT_MACRO(BOOST_NO_DECLTYPE);
+   PRINT_MACRO(BOOST_NO_DECLTYPE_N3276);
    PRINT_MACRO(BOOST_NO_DEFAULTED_FUNCTIONS);
    PRINT_MACRO(BOOST_NO_DELETED_FUNCTIONS);
    PRINT_MACRO(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS);
@@ -1079,6 +1080,10 @@ void print_boost_macros()
 
 
 
+
+
+
+
    // END GENERATED BLOCK
 
    PRINT_MACRO(BOOST_INTEL);
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 08fecc6c..10abbd62 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -1,4 +1,4 @@
-//  This file was automatically generated on Mon May 09 12:11:18 2011
+//  This file was automatically generated on Wed Jun  1 21:44:56 2011
 //  by libs/config/tools/generate.cpp
 //  Copyright John Maddock 2002-4.
 //  Use, modification and distribution are subject to the 
@@ -197,6 +197,11 @@ namespace boost_no_cwctype = empty_boost;
 #else
 namespace boost_no_decltype = empty_boost;
 #endif
+#ifndef BOOST_NO_DECLTYPE_N3276
+#include "boost_no_decltype_n3276.ipp"
+#else
+namespace boost_no_decltype_n3276 = empty_boost;
+#endif
 #ifndef BOOST_DEDUCED_TYPENAME
 #include "boost_no_ded_typename.ipp"
 #else
@@ -1276,6 +1281,11 @@ int main( int, char *[] )
       std::cerr << "Failed test for BOOST_NO_DECLTYPE at: " << __FILE__ << ":" << __LINE__ << std::endl;
       ++error_count;
    }
+   if(0 != boost_no_decltype_n3276::test())
+   {
+      std::cerr << "Failed test for BOOST_NO_DECLTYPE_N3276 at: " << __FILE__ << ":" << __LINE__ << std::endl;
+      ++error_count;
+   }
    if(0 != boost_deduced_typename::test())
    {
       std::cerr << "Failed test for BOOST_DEDUCED_TYPENAME at: " << __FILE__ << ":" << __LINE__ << std::endl;
diff --git a/test/no_decltype_n3276_fail.cpp b/test/no_decltype_n3276_fail.cpp
new file mode 100644
index 00000000..ab36e4b9
--- /dev/null
+++ b/test/no_decltype_n3276_fail.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Wed Jun  1 21:44:56 2011
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_DECLTYPE_N3276
+// This file should not compile, if it does then
+// BOOST_NO_DECLTYPE_N3276 should not be defined.
+// See file boost_no_decltype_n3276.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include 
+#include "test.hpp"
+
+#ifdef BOOST_NO_DECLTYPE_N3276
+#include "boost_no_decltype_n3276.ipp"
+#else
+#error "this file should not compile"
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_decltype_n3276::test();
+}
+
diff --git a/test/no_decltype_n3276_pass.cpp b/test/no_decltype_n3276_pass.cpp
new file mode 100644
index 00000000..6c0ccea0
--- /dev/null
+++ b/test/no_decltype_n3276_pass.cpp
@@ -0,0 +1,37 @@
+//  This file was automatically generated on Wed Jun  1 21:44:56 2011
+//  by libs/config/tools/generate.cpp
+//  Copyright John Maddock 2002-4.
+//  Use, modification and distribution are subject to the 
+//  Boost Software License, Version 1.0. (See accompanying file 
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+//  See http://www.boost.org/libs/config for the most recent version.//
+//  Revision $Id$
+//
+
+
+// Test file for macro BOOST_NO_DECLTYPE_N3276
+// This file should compile, if it does not then
+// BOOST_NO_DECLTYPE_N3276 should be defined.
+// See file boost_no_decltype_n3276.ipp for details
+
+// Must not have BOOST_ASSERT_CONFIG set; it defeats
+// the objective of this file:
+#ifdef BOOST_ASSERT_CONFIG
+#  undef BOOST_ASSERT_CONFIG
+#endif
+
+#include 
+#include "test.hpp"
+
+#ifndef BOOST_NO_DECLTYPE_N3276
+#include "boost_no_decltype_n3276.ipp"
+#else
+namespace boost_no_decltype_n3276 = empty_boost;
+#endif
+
+int main( int, char *[] )
+{
+   return boost_no_decltype_n3276::test();
+}
+
diff --git a/tools/generate.cpp b/tools/generate.cpp
index c9a0b0d4..21c70de9 100644
--- a/tools/generate.cpp
+++ b/tools/generate.cpp
@@ -259,13 +259,13 @@ int cpp_main(int argc, char* argv[])
    //
    if(argc > 1)
    {
-      fs::path p(argv[1], fs::native);
+      fs::path p(argv[1]);
       config_path = p / "libs" / "config" / "test" ;
    }
    else
    {
       // try __FILE__:
-      fs::path p(__FILE__, fs::native);
+      fs::path p(__FILE__);
       config_path = p.branch_path().branch_path() / "test";
    }
    std::cout << "Info: Boost.Config test path set as: " << config_path.string() << std::endl;