From 76680cf30eafd5728c2371335fe9c58b0c767db4 Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Fri, 10 Nov 2006 21:32:25 +0000
Subject: [PATCH] Merge GCC warnings fix from RC_1_34_0

[SVN r35998]
---
 include/boost/mpl/assert.hpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/boost/mpl/assert.hpp b/include/boost/mpl/assert.hpp
index a3d69ef..3d2f0e6 100644
--- a/include/boost/mpl/assert.hpp
+++ b/include/boost/mpl/assert.hpp
@@ -47,7 +47,11 @@
 #   define BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER
 #endif
 
-#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+// agurt, 10/nov/06: use enums for Borland (which cannot cope with static constants) 
+// and GCC (which issues "unused variable" warnings when static constants are used 
+// at a function scope)
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+    || (BOOST_MPL_CFG_GCC != 0)
 #   define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) enum { expr }
 #else
 #   define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) BOOST_STATIC_CONSTANT(T, expr)