From c2e85989332e7fa2f51c3a33ac178442c2b75236 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Fri, 1 May 2020 18:51:49 -0400 Subject: [PATCH 1/3] Documented the basic Embarcadero macros. I did not document the extended Embarcadero macros beginning with BOOST_EMBTC_ but I did define them all to the value of 1 whereas before they were just defined to an empty value. --- doc/macro_reference.qbk | 12 ++++++++++++ include/boost/config/compiler/codegear.hpp | 20 ++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/doc/macro_reference.qbk b/doc/macro_reference.qbk index fcf4c21c..ab8ee372 100644 --- a/doc/macro_reference.qbk +++ b/doc/macro_reference.qbk @@ -1389,6 +1389,18 @@ compiler version macro. [[`BOOST_CLANG`][``][ Defined to 1 if the compiler is the Clang compiler. ]] +[[`BOOST_BORLANDC`][``][ +Defined to the value of __BORLANDC__ if the compiler is the Embarcadero +non-clang based compiler. +]] +[[`BOOST_CODEGEARC`][``][ +Defined to the value of __CODEGEARC__ if the compiler is the Embarcadero +non-clang based compiler. +]] +[[`BOOST_EMBTC`][``][ +Defined to the value of __CODEGEARC__ if the compiler is the Embarcadero +clang based compiler. +]] [[`BOOST_WINDOWS`][``][ Defined if the Windows platform API is available. ]] diff --git a/include/boost/config/compiler/codegear.hpp b/include/boost/config/compiler/codegear.hpp index 3fdaa97a..77949aaf 100644 --- a/include/boost/config/compiler/codegear.hpp +++ b/include/boost/config/compiler/codegear.hpp @@ -106,26 +106,26 @@ // Detecting which Embarcadero driver is being used #if defined(BOOST_EMBTC) # if defined(_WIN64) -# define BOOST_EMBTC_WIN64 -# define BOOST_EMBTC_WINDOWS +# define BOOST_EMBTC_WIN64 1 +# define BOOST_EMBTC_WINDOWS 1 # ifndef BOOST_USE_WINDOWS_H # define BOOST_USE_WINDOWS_H # endif # elif defined(_WIN32) -# define BOOST_EMBTC_WIN32C -# define BOOST_EMBTC_WINDOWS +# define BOOST_EMBTC_WIN32C 1 +# define BOOST_EMBTC_WINDOWS 1 # ifndef BOOST_USE_WINDOWS_H # define BOOST_USE_WINDOWS_H # endif # elif defined(__APPLE__) && defined(__arm__) -# define BOOST_EMBTC_IOSARM -# define BOOST_EMBTC_IOS +# define BOOST_EMBTC_IOSARM 1 +# define BOOST_EMBTC_IOS 1 # elif defined(__APPLE__) && defined(__aarch64__) -# define BOOST_EMBTC_IOSARM64 -# define BOOST_EMBTC_IOS +# define BOOST_EMBTC_IOSARM64 1 +# define BOOST_EMBTC_IOS 1 # elif defined(__ANDROID__) && defined(__arm__) -# define BOOST_EMBTC_AARM -# define BOOST_EMBTC_ANDROID +# define BOOST_EMBTC_AARM 1 +# define BOOST_EMBTC_ANDROID 1 # elif # if defined(BOOST_ASSERT_CONFIG) # error "Unknown Embarcadero driver" From dea5465f9e88039e0af29768eeb50066898f2658 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Sun, 3 May 2020 16:24:55 -0400 Subject: [PATCH 2/3] Changed the latest accepted value of __BORLANDC__ for when __CODEGEARC__ is not defined. --- include/boost/config/compiler/borland.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/config/compiler/borland.hpp b/include/boost/config/compiler/borland.hpp index 366cd904..c5113b71 100644 --- a/include/boost/config/compiler/borland.hpp +++ b/include/boost/config/compiler/borland.hpp @@ -17,7 +17,7 @@ #endif // last known compiler version: -#if (__BORLANDC__ > 0x740) +#if (__BORLANDC__ > 0x613) //# if defined(BOOST_ASSERT_CONFIG) # error "boost: Unknown compiler version - please run the configure tests and report the results" //# else From ab7bb5c511f734679b91d58ca48ec6d307495f76 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 23 Jun 2020 18:55:52 +0100 Subject: [PATCH 3/3] regenerate docs. --- doc/html/boost_config/acknowledgements.html | 4 +- .../boost_config/boost_macro_reference.html | 103 +++++++++++++++++- doc/html/boost_config/build_config.html | 4 +- doc/html/boost_config/cstdint.html | 4 +- .../guidelines_for_boost_authors.html | 4 +- doc/html/boost_config/rationale.html | 4 +- doc/html/index.html | 6 +- 7 files changed, 114 insertions(+), 15 deletions(-) diff --git a/doc/html/boost_config/acknowledgements.html b/doc/html/boost_config/acknowledgements.html index 91d90849..c6b9bcdf 100644 --- a/doc/html/boost_config/acknowledgements.html +++ b/doc/html/boost_config/acknowledgements.html @@ -1,6 +1,6 @@ - + Acknowledgements @@ -47,7 +47,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+ BOOST_NO_CXX11_OVERRIDE +

+
+

+ The compiler does not support override. +

+

BOOST_NO_CXX11_POINTER_TRAITS @@ -3420,6 +3432,20 @@

+

+ BOOST_OVERRIDE +

+
+

+ If BOOST_NO_CXX11_OVERRIDE + is not defined (i.e. C++11 compliant compilers), expands to override keyword, otherwise expands + to nothing. +

+

BOOST_STATIC_CONSTEXPR @@ -5005,6 +5031,60 @@

+

+ BOOST_BORLANDC +

+
+

+ <boost/config.hpp> +

+
+

+ Defined to the value of __BORLANDC__ if the compiler is the Embarcadero + non-clang based compiler. +

+
+

+ BOOST_CODEGEARC +

+
+

+ <boost/config.hpp> +

+
+

+ Defined to the value of __CODEGEARC__ if the compiler is the Embarcadero + non-clang based compiler. +

+
+

+ BOOST_EMBTC +

+
+

+ <boost/config.hpp> +

+
+

+ Defined to the value of __CODEGEARC__ if the compiler is the Embarcadero + clang based compiler. +

+

BOOST_WINDOWS @@ -5112,6 +5192,25 @@

+

+ BOOST_LIBSTDCXX_VERSION +

+
+

+ <boost/config.hpp> +

+
+

+ Defined if the libstdc++ standard library is in use. Has the value + of normalised 5 digit integer of the form VVMMM where VV is the + major version number, MM is the minor version number. +

+
@@ -6519,7 +6618,7 @@ -
-
-
-
-