[Boost-commit] svn:boost r85703 - branches/release/boost/intrusive/detail

Subject: [Boost-commit] svn:boost r85703 - branches/release/boost/intrusive/detail
From: igaztanaga_at_[hidden]
Date: 2013-09-16 12:59:29

Author: igaztanaga
Date: 2013-09-16 12:59:29 EDT (Mon, 16 Sep 2013)
New Revision: 85703
URL: http://svn.boost.org/trac/boost/changeset/85703

Log:
Last merge for 1.55 (Intrusive)

Text files modified: 
   branches/release/boost/intrusive/detail/utilities.hpp |     4 ++++                                    
   1 files changed, 4 insertions(+), 0 deletions(-)

Modified: branches/release/boost/intrusive/detail/utilities.hpp
==============================================================================
--- branches/release/boost/intrusive/detail/utilities.hpp	Mon Sep 16 12:59:03 2013	(r85702)
+++ branches/release/boost/intrusive/detail/utilities.hpp	2013-09-16 12:59:29 EDT (Mon, 16 Sep 2013)	(r85703)
@@ -429,6 +429,8 @@
    static const std::size_t pow   = 31;
 };
 
+#ifndef BOOST_NO_INT64_T
+
 template <class SizeType>
 struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 64> >::type>
 {
@@ -436,6 +438,8 @@
    static const std::size_t pow   = 63;
 };
 
+#endif   //BOOST_NO_INT64_T
+
 // Returns floor(pow(sqrt(2), x * 2 + 1)).
 // Defined for X from 0 up to the number of bits in size_t minus 1.
 inline std::size_t sqrt2_pow_2xplus1 (std::size_t x)