import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / integer / integer_log2.hpp

diff --git a/ceph/src/boost/boost/integer/integer_log2.hpp b/ceph/src/boost/boost/integer/integer_log2.hpp
index 8b34ce7440a8eb8804052b7620aa063ea0cf6d5f..ef073fd7a68f501b4915ff176b45e3e890d6d686 100644 (file)
--- a/ceph/src/boost/boost/integer/integer_log2.hpp
+++ b/ceph/src/boost/boost/integer/integer_log2.hpp
@@ -15,12 +15,12 @@
 #ifndef BOOST_INTEGER_INTEGER_LOG2_HPP
 #define BOOST_INTEGER_INTEGER_LOG2_HPP
 
-#include <assert.h>
-#ifdef __BORLANDC__
-#include <climits>
-#endif
 #include <boost/limits.hpp>
 #include <boost/config.hpp>
+#include <boost/assert.hpp>
+#if defined(BOOST_BORLANDC)
+#include <climits>
+#endif
 
 
 namespace boost {
@@ -75,7 +75,7 @@ namespace boost {
   template <typename T>
   struct width {
 
-#ifdef __BORLANDC__
+#ifdef BOOST_BORLANDC
       BOOST_STATIC_CONSTANT(int, value = sizeof(T) * CHAR_BIT);
 #else
       BOOST_STATIC_CONSTANT(int, value = (std::numeric_limits<T>::digits));
@@ -93,7 +93,7 @@ namespace boost {
  template <typename T>
  int integer_log2(T x) {
 
-     assert(x > 0);
+     BOOST_ASSERT(x > 0);
 
      const int n = detail::max_pow2_less<
                      detail::width<T> :: value, 4