import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / regex / src / c_regex_traits.cpp

diff --git a/ceph/src/boost/libs/regex/src/c_regex_traits.cpp b/ceph/src/boost/libs/regex/src/c_regex_traits.cpp
index a0b52ee4e93027f09d728a11cc86159df063f1a1..dd35656136b24443650f2be824274fd4f4237524 100644 (file)
--- a/ceph/src/boost/libs/regex/src/c_regex_traits.cpp
+++ b/ceph/src/boost/libs/regex/src/c_regex_traits.cpp
@@ -23,7 +23,7 @@
 #include <boost/detail/workaround.hpp>
 #include "internals.hpp"
 
-#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+#if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x560)
 
 #include <boost/regex/v4/c_regex_traits.hpp>
 #include <boost/regex/v4/primary_transform.hpp>
@@ -157,7 +157,7 @@ c_regex_traits<char>::char_class_type BOOST_REGEX_CALL c_regex_traits<char>::loo
          s[i] = static_cast<char>((std::tolower)(static_cast<unsigned char>(s[i])));
       idx = ::boost::BOOST_REGEX_DETAIL_NS::get_default_class_id(&*s.begin(), &*s.begin() + s.size());
    }
-   BOOST_ASSERT(std::size_t(idx+1) < sizeof(masks) / sizeof(masks[0]));
+   BOOST_ASSERT(std::size_t(idx) + 1u < sizeof(masks) / sizeof(masks[0]));
    return masks[idx+1];
 }