import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/libs/regex/src/cregex.cpp b/ceph/src/boost/libs/regex/src/cregex.cpp
index a1ae3b087cdaef8e59f4e319140193b36a269041..118c590a1170f95b6f45c60129ae77b5ac37d664 100644 (file)
--- a/ceph/src/boost/libs/regex/src/cregex.cpp
+++ b/ceph/src/boost/libs/regex/src/cregex.cpp
@@ -37,8 +37,8 @@ typedef boost::match_flag_type match_flag_type;
 
 namespace boost{
 
-#ifdef __BORLANDC__
-#if __BORLANDC__ < 0x530
+#ifdef BOOST_BORLANDC
+#if BOOST_BORLANDC < 0x530
 //
 // we need to instantiate the vector classes we use
 // since declaring a reference to type doesn't seem to
@@ -70,6 +70,10 @@ inline std::string to_string(const char* i, const char* j)
 }
 namespace BOOST_REGEX_DETAIL_NS{
 
+#ifdef BOOST_MSVC
+#  pragma warning(push)
+#pragma warning(disable:26812)
+#endif
 class RegExData
 {
 public:
@@ -103,6 +107,9 @@ public:
 #endif
    strings(), positions() {}
 };
+#ifdef BOOST_MSVC
+#  pragma warning(pop)
+#endif
 
 void RegExData::update()
 {
@@ -583,7 +590,7 @@ const std::size_t RegEx::npos = ~static_cast<std::size_t>(0);
 
 } // namespace boost
 
-#if defined(__BORLANDC__) && (__BORLANDC__ >= 0x550) && (__BORLANDC__ <= 0x551) && !defined(_RWSTD_COMPILE_INSTANTIATE)
+#if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x550) && (BOOST_BORLANDC <= 0x551) && !defined(_RWSTD_COMPILE_INSTANTIATE)
 //
 // this is an ugly hack to work around an ugly problem:
 // by default this file will produce unresolved externals during