optional_optimization branch

[SVN r77091]
Add BOOST_STATIC_ASSERT_MSG
2026-01-20 05:02:33 +00:00 · 2012-02-22 10:37:27 +00:00 · 2011-01-31 15:03:41 +00:00 · 2011-01-01 12:28:35 +00:00 · 2010-06-20 18:00:48 +00:00 · 2010-02-16 12:45:53 +00:00
3 changed files with 22 additions and 89 deletions
--- a/doc/static_assert.qbk
+++ b/doc/static_assert.qbk
@@ -36,7 +36,7 @@ the static assertion will be evaluated at the time the template is instantiated;
 this is particularly useful for validating template parameters.

 If the C++0x `static_assert` feature is available, both macros will use it.
-For `BOOST_STATIC_ASSERT(x)`, the error message will be a stringized version of `x`.
+For `BOOST_STATIC_ASSERT(x)`, the error message with be a stringized version of `x`.
 For `BOOST_STATIC_ASSERT_MSG(x, msg)`, the error message will be the `msg` string.

 If the C++0x `static_assert` feature is not available, `BOOST_STATIC_ASSERT_MSG(x, msg)`
@@ -151,10 +151,10 @@ using something like this:
   class myclass
   {
   private:
-      BOOST_STATIC_ASSERT_MSG(std::numeric_limits<UnsignedInt>::is_specialized, "myclass can only be specialized for types with numeric_limits support.");
-      BOOST_STATIC_ASSERT_MSG(std::numeric_limits<UnsignedInt>::digits >= 16, "Template argument UnsignedInt must have at least 16 bits precision.")
-      BOOST_STATIC_ASSERT_MSG(std::numeric_limits<UnsignedInt>::is_integer, "Template argument UnsignedInt must be an integer.");
-      BOOST_STATIC_ASSERT_MSG(!std::numeric_limits<UnsignedInt>::is_signed, "Template argument UnsignedInt must not be signed.");
+      BOOST_STATIC_ASSERT((std::numeric_limits<UnsignedInt>::digits >= 16)
+                           && std::numeric_limits<UnsignedInt>::is_specialized
+                           && std::numeric_limits<UnsignedInt>::is_integer
+                           && !std::numeric_limits<UnsignedInt>::is_signed);
   public:
      /* details here */
   };
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@@ -17,23 +17,10 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>

-#if defined(__GNUC__) && !defined(__GXX_EXPERIMENTAL_CXX0X__)
-//
-// This is horrible, but it seems to be the only we can shut up the
-// "anonymous variadic macros were introduced in C99 [-Wvariadic-macros]"
-// warning that get spewed out otherwise in non-C++11 mode.
-//
-#pragma GCC system_header
-#endif
-
-#ifndef BOOST_NO_CXX11_STATIC_ASSERT
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__)
-#  else
-#     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
-#  endif
+#ifndef BOOST_NO_STATIC_ASSERT
+#  define BOOST_STATIC_ASSERT_MSG( B, Msg ) static_assert(B, Msg)
 #else
-#     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
+#  define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
 #endif

 #ifdef __BORLANDC__
@@ -52,33 +39,13 @@
 // then enable this:
 //
 #if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4)))
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) ((__VA_ARGS__) == 0 ? false : true)
-#  else
-#     define BOOST_STATIC_ASSERT_BOOL_CAST( x ) ((x) == 0 ? false : true)
-#  endif
+#  define BOOST_STATIC_ASSERT_BOOL_CAST( x ) ((x) == 0 ? false : true)
 #else
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT_BOOL_CAST( ... ) (bool)(__VA_ARGS__)
-#  else
-#     define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
-#  endif
-#endif
-//
-// If the compiler warns about unused typedefs then enable this:
-//
-#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
-#  define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#  define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
+#  define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
 #endif

-#ifndef BOOST_NO_CXX11_STATIC_ASSERT
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT( ... ) static_assert(__VA_ARGS__, #__VA_ARGS__)
-#  else
-#     define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
-#  endif
+#ifndef BOOST_NO_STATIC_ASSERT
+#  define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
 #else

 namespace boost{
@@ -124,28 +91,17 @@ template<int x> struct static_assert_test{};
   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >)\
      > boost_static_assert_typedef_
-#elif defined(BOOST_MSVC) && defined(BOOST_NO_CXX11_VARIADIC_MACROS)
+#elif defined(BOOST_MSVC)
 #define BOOST_STATIC_ASSERT( B ) \
   typedef ::boost::static_assert_test<\
      sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST ( B ) >)>\
         BOOST_JOIN(boost_static_assert_typedef_, __COUNTER__)
-#elif defined(BOOST_MSVC)
-#define BOOST_STATIC_ASSERT(...) \
-   typedef ::boost::static_assert_test<\
-      sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST (__VA_ARGS__) >)>\
-         BOOST_JOIN(boost_static_assert_typedef_, __COUNTER__)
-#elif (defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND))  && defined(BOOST_NO_CXX11_VARIADIC_MACROS)
+#elif defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND)
 // agurt 15/sep/02: a special care is needed to force Intel C++ issue an error 
 // instead of warning in case of failure
 # define BOOST_STATIC_ASSERT( B ) \
    typedef char BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \
        [ ::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >::value ]
-#elif (defined(BOOST_INTEL_CXX_VERSION) || defined(BOOST_SA_GCC_WORKAROUND))  && !defined(BOOST_NO_CXX11_VARIADIC_MACROS)
-// agurt 15/sep/02: a special care is needed to force Intel C++ issue an error 
-// instead of warning in case of failure
-# define BOOST_STATIC_ASSERT(...) \
-    typedef char BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \
-        [ ::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( __VA_ARGS__ ) >::value ]
 #elif defined(__sgi)
 // special version for SGI MIPSpro compiler
 #define BOOST_STATIC_ASSERT( B ) \
@@ -163,32 +119,19 @@ template<int x> struct static_assert_test{};
       sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >) )
 #else
 // generic version
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#     define BOOST_STATIC_ASSERT( ... ) \
-         typedef ::boost::static_assert_test<\
-            sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( __VA_ARGS__ ) >)>\
-               BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#  else
-#     define BOOST_STATIC_ASSERT( B ) \
-         typedef ::boost::static_assert_test<\
-            sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\
-               BOOST_JOIN(boost_static_assert_typedef_, __LINE__) BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
-#  endif
+#define BOOST_STATIC_ASSERT( B ) \
+   typedef ::boost::static_assert_test<\
+      sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\
+         BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
 #endif

 #else
 // alternative enum based implementation:
-#  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-#    define BOOST_STATIC_ASSERT( ... ) \
-         enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
-            = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( __VA_ARGS__ ) >) }
-#  else
-#    define BOOST_STATIC_ASSERT(B) \
-         enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
-            = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) }
-#  endif
+#define BOOST_STATIC_ASSERT( B ) \
+   enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
+      = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) }
 #endif
-#endif // defined(BOOST_NO_CXX11_STATIC_ASSERT)
+#endif // defined(BOOST_NO_STATIC_ASSERT)

 #endif // BOOST_STATIC_ASSERT_HPP

--- a/static_assert_test.cpp
+++ b/static_assert_test.cpp
@@ -58,7 +58,6 @@ struct Bob
 template <class Int, class Char>
 struct Bill
 {
-   BOOST_STATIC_CONSTANT(int, value = 1);
  private:  // can be in private, to avoid namespace pollution
    BOOST_STATIC_ASSERT(sizeof(Int) > sizeof(char));
    BOOST_STATIC_ASSERT_MSG(sizeof(Int) > sizeof(char), "msg9");
@@ -90,15 +89,6 @@ void test_Bill() // BOOST_STATIC_ASSERTs are not triggerred until instantiated
 int main()
 { 
   test_Bill();
-   //
-   // Test variadic macro support:
-   //
-#ifndef BOOST_NO_CXX11_VARIADIC_MACROS
-   BOOST_STATIC_ASSERT(Bill<int, char>::value);
-#ifndef BOOST_NO_CXX11_STATIC_ASSERT
-   BOOST_STATIC_ASSERT_MSG(Bill<int, char>::value, "This is a message");
-#endif
-#endif
   return 0; 
 }
Author	SHA1	Message	Date
Christopher Hite	09eb18d337	optional_optimization branch [SVN r77091]	2012-02-22 10:37:27 +00:00
Beman Dawes	e910489e16	Add BOOST_STATIC_ASSERT_MSG [SVN r68584]	2011-01-31 15:03:41 +00:00
John Maddock	f57e592d1e	Change PDF URL to SF download page. [SVN r67529]	2011-01-01 12:28:35 +00:00
Daniel James	a0a2bd5703	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Beman Dawes	80c6340833	Use BOOST_NO_STATIC_ASSERT [SVN r59698]	2010-02-16 12:45:53 +00:00
John Maddock	138c5bde91	Fix gcc warning. [SVN r57495]	2009-11-08 18:59:24 +00:00
Troy D. Straszheim	5d9274a683	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	87ecd7d39f	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
John Maddock	62461d8848	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
John Maddock	a7e33291eb	Fix up PDF generation options. [SVN r50910]	2009-01-30 18:20:49 +00:00
John Maddock	413e7eda07	Fix inclusion of incorrect header. Fixes #2537. [SVN r50371]	2008-12-23 12:03:43 +00:00
Michael A. Jackson	a9a9f0591b	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	effe841116	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Daniel James	8cfe5d77c0	Fix a PDF link that I missed before. [SVN r47364]	2008-07-12 19:32:15 +00:00
John Maddock	8b819d5c6c	Changed BOOST_STATIC_ASSERT for GCC to suppress warnings about old C style casts. [SVN r43988]	2008-04-01 17:53:56 +00:00
John Maddock	bc5065e495	Added link to PDF docs. [SVN r43357]	2008-02-21 16:49:59 +00:00
Douglas Gregor	1663a635aa	Fix C++0x helper macros [SVN r37178]	2007-03-14 09:20:38 +00:00
John Maddock	b9a3b24aef	remove dead file. [SVN r36552]	2006-12-31 17:27:27 +00:00
Douglas Gregor	a0dac351fb	Preliminary C++0x support [SVN r36149]	2006-11-22 15:58:39 +00:00
John Maddock	c68b2114de	Added trivial docs change, based on user suggestion, and brought example code into synch. [SVN r34874]	2006-08-11 18:14:13 +00:00
John Maddock	48b6934f7f	Added license info. [SVN r34585]	2006-07-17 10:49:22 +00:00