Create merge base for git.

Merge static_assert fix from Trunk.
Fixes #8644. [SVN r84858]
2026-01-24 18:32:25 +00:00 · 2014-04-06 14:27:40 +01:00 · 2013-06-21 12:27:49 +00:00 · 2013-06-09 12:02:07 +00:00 · 2013-06-08 10:58:41 +00:00 · 2013-04-08 08:45:06 +00:00
1 changed files with 2 additions and 1 deletions
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@@ -30,7 +30,7 @@
 #  ifndef BOOST_NO_CXX11_VARIADIC_MACROS
 #     define BOOST_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__)
 #  else
-#     define BOOST_STATIC_ASSERT_MSG( ... ) static_assert(__VA_ARGS__)
+#     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
 #  endif
 #else
 #     define BOOST_STATIC_ASSERT_MSG( B, Msg ) BOOST_STATIC_ASSERT( B )
@@ -183,6 +183,7 @@ template<int x> struct static_assert_test{};
         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
Author	SHA1	Message	Date
Daniel James	29a7d491b8	Create merge base for git.	2014-04-06 14:27:40 +01:00
John Maddock	f2b7643595	Merge static_assert fix from Trunk. Fixes #8644. [SVN r84858]	2013-06-21 12:27:49 +00:00
John Maddock	bc29f7ab62	Apply patch from 8644. Fixes #8644. [SVN r84713]	2013-06-09 12:02:07 +00:00
John Maddock	c951c0db9a	Apply patch from #8644 . Refs #8644. [SVN r84686]	2013-06-08 10:58:41 +00:00
John Maddock	8912d413ba	Fix for compilers that have no variadic macros but do have static_assert (are there any??) Fixes #8346. [SVN r83806]	2013-04-08 08:45:06 +00:00
John Maddock	bf3ee21630	More variadic macro support for msvc and Intel. [SVN r83444]	2013-03-15 18:21:03 +00:00
John Maddock	c40a626f1c	Suppress GCC warnings. [SVN r83104]	2013-02-23 18:26:39 +00:00
John Maddock	2993231dad	Use variadic macros in static assert to make use easier. Add warning suppression for GCC. Minor doc fix. Fixes #5810. Fixes #7242. Fixes #7966. [SVN r82886]	2013-02-14 18:31:33 +00:00
Marshall Clow	ce9e800db8	Removed missed usage of deprecated macros in Boost.StaticAssert [SVN r81588]	2012-11-27 14:30:10 +00:00
John Maddock	5e7b62a1f4	Fix doc typo. Fixes #6355. [SVN r80059]	2012-08-16 08:14:53 +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