From cb09a717dd25a70984ba48be4c0b36b47bbfe01c Mon Sep 17 00:00:00 2001 From: John Maddock Date: Sun, 4 Feb 2001 12:59:54 +0000 Subject: [PATCH] tentative fix for MWCW [SVN r8914] --- include/boost/static_assert.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/static_assert.hpp b/include/boost/static_assert.hpp index 9e502ad..7922876 100644 --- a/include/boost/static_assert.hpp +++ b/include/boost/static_assert.hpp @@ -52,7 +52,7 @@ template struct static_assert_test{}; // used as an enum initialiser, or as a template argument depending which version // is in use... // -#ifndef BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS +#if !defined(BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS) && !defined(__MWERKS__) #ifndef BOOST_MSVC #define BOOST_STATIC_ASSERT( B ) \ typedef ::boost::static_assert_test<\ @@ -60,7 +60,7 @@ template struct static_assert_test{}; BOOST_ASSERT_JOIN(boost_static_assert_typedef_, __LINE__) #else // __LINE__ macro broken when -ZI is used see Q199057 -// fortunately MSVC ignores duplicate typedef's: +// fortunately MSVC ignores duplicate typedef's. #define BOOST_STATIC_ASSERT( B ) \ typedef ::boost::static_assert_test<\ sizeof(::boost::STATIC_ASSERTION_FAILURE< ( B ) >)\