[Boost-commit] svn:boost r82609 - branches/release/boost/random/detail

Subject: [Boost-commit] svn:boost r82609 - branches/release/boost/random/detail
From: marshall_at_[hidden]
Date: 2013-01-25 12:06:08

Author: marshall
Date: 2013-01-25 12:06:07 EST (Fri, 25 Jan 2013)
New Revision: 82609
URL: http://svn.boost.org/trac/boost/changeset/82609

Log:
Merge bug fix to release; Fixes #6854
Properties modified: 
   branches/release/boost/random/detail/integer_log2.hpp   (contents, props changed)
Text files modified: 
   branches/release/boost/random/detail/integer_log2.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: branches/release/boost/random/detail/integer_log2.hpp
==============================================================================
--- branches/release/boost/random/detail/integer_log2.hpp	(original)
+++ branches/release/boost/random/detail/integer_log2.hpp	2013-01-25 12:06:07 EST (Fri, 25 Jan 2013)
@@ -22,12 +22,12 @@
 namespace random {
 namespace detail {
 
-#if !defined(BOOST_NO_CONSTEXPR)
+#if !defined(BOOST_NO_CXX11_CONSTEXPR)
 #define BOOST_RANDOM_DETAIL_CONSTEXPR constexpr
 #elif defined(BOOST_MSVC)
 #define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
 #elif defined(__GNUC__) && __GNUC__ >= 4
-#define BOOST_RANDOM_DETAIL_CONSTEXPR __attribute__((const)) __attribute__((always_inline))
+#define BOOST_RANDOM_DETAIL_CONSTEXPR inline __attribute__((const)) __attribute__((always_inline))
 #else
 #define BOOST_RANDOM_DETAIL_CONSTEXPR inline
 #endif
@@ -35,7 +35,7 @@
 template<int Shift>
 struct integer_log2_impl
 {
-#if defined(BOOST_NO_CONSTEXPR)
+#if defined(BOOST_NO_CXX11_CONSTEXPR)
     template<class T>
     BOOST_RANDOM_DETAIL_CONSTEXPR static int apply(T t, int accum)
     {