diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk index 25a5ccc4..9a2d1565 100644 --- a/doc/macro_reference.qbk +++ b/doc/macro_reference.qbk @@ -656,6 +656,7 @@ that are not yet supported by a particular compiler or library. [[`BOOST_NO_CXX11_ADDRESSOF`][The standard library header has no working std::addressof.]] [[`BOOST_NO_CXX11_ALIGNAS`][The compiler does not support the `alignas` keyword.]] +[[`BOOST_NO_CXX11_ALIGNOF`][The compiler does not support the `alignof` keyword.]] [[`BOOST_NO_CXX11_ALLOCATOR`][The standard library does not provide a C++11 version of `std::allocator` in .]] [[`BOOST_NO_CXX11_ATOMIC_SMART_PTR`][The standard library does not support atomic smart pointer operations.]] [[`BOOST_NO_CXX11_AUTO_DECLARATIONS`][The compiler does not support diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp index c5113b71..567636c5 100644 --- a/include/boost/config/compiler/borland.hpp +++ b/include/boost/config/compiler/borland.hpp @@ -194,6 +194,7 @@ #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp index cb08d27f..1eeed315 100644 --- a/include/boost/config/compiler/clang.hpp +++ b/include/boost/config/compiler/clang.hpp @@ -240,6 +240,10 @@ # define BOOST_NO_CXX11_ALIGNAS #endif +#if !__has_feature(cxx_alignof) +# define BOOST_NO_CXX11_ALIGNOF +#endif + #if !__has_feature(cxx_trailing_return) # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #endif diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp index 77949aaf..4d3f42ae 100644 --- a/include/boost/config/compiler/codegear.hpp +++ b/include/boost/config/compiler/codegear.hpp @@ -260,6 +260,7 @@ #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/common_edg.hpp b/include/boost/config/compiler/common_edg.hpp index 7887b30a..dc049893 100644 --- a/include/boost/config/compiler/common_edg.hpp +++ b/include/boost/config/compiler/common_edg.hpp @@ -92,6 +92,7 @@ #define BOOST_NO_CXX11_TEMPLATE_ALIASES #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/cray.hpp b/include/boost/config/compiler/cray.hpp index 2f1e9e8e..e40fd05a 100644 --- a/include/boost/config/compiler/cray.hpp +++ b/include/boost/config/compiler/cray.hpp @@ -375,6 +375,7 @@ #if __cplusplus >= 201103L #undef BOOST_NO_CXX11_ALIGNAS +#undef BOOST_NO_CXX11_ALIGNOF #undef BOOST_NO_CXX11_DECLTYPE_N3276 #define BOOST_NO_CXX11_HDR_ATOMIC #undef BOOST_NO_CXX11_HDR_FUNCTIONAL diff --git a/include/boost/config/compiler/digitalmars.hpp b/include/boost/config/compiler/digitalmars.hpp index 7641ee8a..bb56ff6c 100644 --- a/include/boost/config/compiler/digitalmars.hpp +++ b/include/boost/config/compiler/digitalmars.hpp @@ -79,6 +79,7 @@ #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/gcc.hpp b/include/boost/config/compiler/gcc.hpp index 4cea0ce2..2f1fe550 100644 --- a/include/boost/config/compiler/gcc.hpp +++ b/include/boost/config/compiler/gcc.hpp @@ -219,6 +219,7 @@ # define BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS # define BOOST_NO_CXX11_RAW_LITERALS # define BOOST_NO_CXX11_UNICODE_LITERALS +# define BOOST_NO_CXX11_ALIGNOF #endif // C++0x features in 4.5.1 and later diff --git a/include/boost/config/compiler/gcc_xml.hpp b/include/boost/config/compiler/gcc_xml.hpp index fd6896a8..75cac44e 100644 --- a/include/boost/config/compiler/gcc_xml.hpp +++ b/include/boost/config/compiler/gcc_xml.hpp @@ -57,6 +57,7 @@ # define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX # define BOOST_NO_CXX11_USER_DEFINED_LITERALS # define BOOST_NO_CXX11_ALIGNAS +# define BOOST_NO_CXX11_ALIGNOF # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES # define BOOST_NO_CXX11_INLINE_NAMESPACES # define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/hp_acc.hpp b/include/boost/config/compiler/hp_acc.hpp index cf5667b5..25636324 100644 --- a/include/boost/config/compiler/hp_acc.hpp +++ b/include/boost/config/compiler/hp_acc.hpp @@ -121,6 +121,7 @@ #define BOOST_NO_CXX11_VARIADIC_TEMPLATES #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/intel.hpp b/include/boost/config/compiler/intel.hpp index 9a06d2fe..6a343972 100644 --- a/include/boost/config/compiler/intel.hpp +++ b/include/boost/config/compiler/intel.hpp @@ -483,6 +483,7 @@ template<> struct assert_intrinsic_wchar_t {}; // BOOST_NO_CXX11_ALIGNAS #if (BOOST_INTEL_CXX_VERSION >= 1500) && (!defined(BOOST_INTEL_GCC_VERSION) || (BOOST_INTEL_GCC_VERSION >= 40800)) && (!defined(_MSC_VER) || (_MSC_FULL_VER >= 190021730)) # undef BOOST_NO_CXX11_ALIGNAS +# undef BOOST_NO_CXX11_ALIGNOF #endif // BOOST_NO_CXX11_TRAILING_RESULT_TYPES diff --git a/include/boost/config/compiler/metrowerks.hpp b/include/boost/config/compiler/metrowerks.hpp index 32c1ca9a..448ab67b 100644 --- a/include/boost/config/compiler/metrowerks.hpp +++ b/include/boost/config/compiler/metrowerks.hpp @@ -122,6 +122,7 @@ #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/mpw.hpp b/include/boost/config/compiler/mpw.hpp index 750d5884..8433f371 100644 --- a/include/boost/config/compiler/mpw.hpp +++ b/include/boost/config/compiler/mpw.hpp @@ -71,6 +71,7 @@ #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_USER_DEFINED_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/pathscale.hpp b/include/boost/config/compiler/pathscale.hpp index 683b0d31..5348cf7f 100644 --- a/include/boost/config/compiler/pathscale.hpp +++ b/include/boost/config/compiler/pathscale.hpp @@ -84,6 +84,7 @@ # define BOOST_NO_CXX11_HDR_CHRONO # define BOOST_NO_CXX11_USER_DEFINED_LITERALS # define BOOST_NO_CXX11_ALIGNAS +# define BOOST_NO_CXX11_ALIGNOF # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES # define BOOST_NO_CXX11_INLINE_NAMESPACES # define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp index 1ab78991..490dc76d 100644 --- a/include/boost/config/compiler/sunpro_cc.hpp +++ b/include/boost/config/compiler/sunpro_cc.hpp @@ -126,6 +126,7 @@ #define BOOST_NO_CXX11_TEMPLATE_ALIASES #define BOOST_NO_CXX11_UNICODE_LITERALS #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_FINAL diff --git a/include/boost/config/compiler/vacpp.hpp b/include/boost/config/compiler/vacpp.hpp index 0280fe29..9cfa1adf 100644 --- a/include/boost/config/compiler/vacpp.hpp +++ b/include/boost/config/compiler/vacpp.hpp @@ -133,6 +133,7 @@ # define BOOST_NO_CXX11_VARIADIC_MACROS #endif #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #define BOOST_NO_CXX11_INLINE_NAMESPACES #define BOOST_NO_CXX11_REF_QUALIFIERS diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index a547b221..6269c471 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -183,6 +183,7 @@ # define BOOST_NO_CXX11_REF_QUALIFIERS # define BOOST_NO_CXX11_USER_DEFINED_LITERALS # define BOOST_NO_CXX11_ALIGNAS +# define BOOST_NO_CXX11_ALIGNOF # define BOOST_NO_CXX11_INLINE_NAMESPACES # define BOOST_NO_CXX11_CHAR16_T # define BOOST_NO_CXX11_CHAR32_T diff --git a/include/boost/config/compiler/xlcpp.hpp b/include/boost/config/compiler/xlcpp.hpp index f002e69c..99b8b245 100644 --- a/include/boost/config/compiler/xlcpp.hpp +++ b/include/boost/config/compiler/xlcpp.hpp @@ -184,6 +184,10 @@ # define BOOST_NO_CXX11_ALIGNAS #endif +#if !__has_feature(cxx_alignof) +# define BOOST_NO_CXX11_ALIGNOF +#endif + #if !__has_feature(cxx_trailing_return) # define BOOST_NO_CXX11_TRAILING_RESULT_TYPES #endif diff --git a/include/boost/config/compiler/xlcpp_zos.hpp b/include/boost/config/compiler/xlcpp_zos.hpp index bc5b7e83..9a177f1b 100644 --- a/include/boost/config/compiler/xlcpp_zos.hpp +++ b/include/boost/config/compiler/xlcpp_zos.hpp @@ -142,6 +142,7 @@ #define BOOST_NO_CXX11_FINAL #define BOOST_NO_CXX11_OVERRIDE #define BOOST_NO_CXX11_ALIGNAS +#define BOOST_NO_CXX11_ALIGNOF #define BOOST_NO_CXX11_UNRESTRICTED_UNION #define BOOST_NO_CXX14_VARIABLE_TEMPLATES #define BOOST_NO_CXX14_RETURN_TYPE_DEDUCTION diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2 index 493bb78b..afa80503 100644 --- a/test/all/Jamfile.v2 +++ b/test/all/Jamfile.v2 @@ -193,6 +193,9 @@ test-suite "BOOST_NO_CXX11_ADDRESSOF" : test-suite "BOOST_NO_CXX11_ALIGNAS" : [ run ../no_cxx11_alignas_pass.cpp ] [ compile-fail ../no_cxx11_alignas_fail.cpp ] ; +test-suite "BOOST_NO_CXX11_ALIGNOF" : +[ run ../no_cxx11_alignof_pass.cpp ] +[ compile-fail ../no_cxx11_alignof_fail.cpp ] ; test-suite "BOOST_NO_CXX11_ALLOCATOR" : [ run ../no_cxx11_allocator_pass.cpp ] [ compile-fail ../no_cxx11_allocator_fail.cpp ] ; diff --git a/test/boost_no_cxx11_alignof.ipp b/test/boost_no_cxx11_alignof.ipp new file mode 100644 index 00000000..43b41493 --- /dev/null +++ b/test/boost_no_cxx11_alignof.ipp @@ -0,0 +1,20 @@ +// Copyright Peter Dimov 2022 + +// 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_CXX11_ALIGNOF +// TITLE: C++11 alignof keyword. +// DESCRIPTION: The compiler does not support the C++11 alignof keyword. + +namespace boost_no_cxx11_alignof { + +int test() +{ + return alignof(int) == alignof(int(&)[2])? 0: 1; +} + +} diff --git a/test/config_info.cpp b/test/config_info.cpp index eaa819a1..aa322fd1 100644 --- a/test/config_info.cpp +++ b/test/config_info.cpp @@ -1089,6 +1089,7 @@ void print_boost_macros() PRINT_MACRO(BOOST_NO_CXX11); PRINT_MACRO(BOOST_NO_CXX11_ADDRESSOF); PRINT_MACRO(BOOST_NO_CXX11_ALIGNAS); + PRINT_MACRO(BOOST_NO_CXX11_ALIGNOF); PRINT_MACRO(BOOST_NO_CXX11_ALLOCATOR); PRINT_MACRO(BOOST_NO_CXX11_ATOMIC_SMART_PTR); PRINT_MACRO(BOOST_NO_CXX11_AUTO_DECLARATIONS); diff --git a/test/config_test.cpp b/test/config_test.cpp index b04e74e1..7d11598c 100644 --- a/test/config_test.cpp +++ b/test/config_test.cpp @@ -122,6 +122,11 @@ namespace boost_no_cxx11_addressof = empty_boost; #else namespace boost_no_cxx11_alignas = empty_boost; #endif +#ifndef BOOST_NO_CXX11_ALIGNOF +#include "boost_no_cxx11_alignof.ipp" +#else +namespace boost_no_cxx11_alignof = empty_boost; +#endif #ifndef BOOST_NO_CXX11_ALLOCATOR #include "boost_no_cxx11_allocator.ipp" #else @@ -1436,6 +1441,11 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_CXX11_ALIGNAS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_cxx11_alignof::test()) + { + std::cerr << "Failed test for BOOST_NO_CXX11_ALIGNOF at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_cxx11_allocator::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_ALLOCATOR at: " << __FILE__ << ":" << __LINE__ << std::endl; diff --git a/test/no_cxx11_alignof_fail.cpp b/test/no_cxx11_alignof_fail.cpp new file mode 100644 index 00000000..1feb0832 --- /dev/null +++ b/test/no_cxx11_alignof_fail.cpp @@ -0,0 +1,37 @@ +// This file was automatically generated on Sun Apr 28 18:36:48 2013 +// 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_CXX11_ALIGNOF +// This file should not compile, if it does then +// BOOST_NO_CXX11_ALIGNOF should not be defined. +// See file boost_no_cxx11_alignof.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_CXX11_ALIGNOF +#include "boost_no_cxx11_alignof.ipp" +#else +#error "this file should not compile" +#endif + +int main( int, char *[] ) +{ + return boost_no_cxx11_alignof::test(); +} + diff --git a/test/no_cxx11_alignof_pass.cpp b/test/no_cxx11_alignof_pass.cpp new file mode 100644 index 00000000..cd476449 --- /dev/null +++ b/test/no_cxx11_alignof_pass.cpp @@ -0,0 +1,37 @@ +// This file was automatically generated on Sun Apr 28 18:36:48 2013 +// 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_CXX11_ALIGNOF +// This file should compile, if it does not then +// BOOST_NO_CXX11_ALIGNOF should be defined. +// See file boost_no_cxx11_alignof.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_CXX11_ALIGNOF +#include "boost_no_cxx11_alignof.ipp" +#else +namespace boost_no_cxx11_alignof = empty_boost; +#endif + +int main( int, char *[] ) +{ + return boost_no_cxx11_alignof::test(); +} +