Initialize BibTeXInfo modifier to zero, always.

[lyx.git] / boost / boost / regex / config.hpp

diff --git a/boost/boost/regex/config.hpp b/boost/boost/regex/config.hpp
index 3b92e6ae47dad24ee98e87a124f6aed267a8c410..e8cec5b7fad20e68affb8acda85b9ab3209969cb 100644 (file)
--- a/boost/boost/regex/config.hpp
+++ b/boost/boost/regex/config.hpp
@@ -170,7 +170,10 @@
 #  define BOOST_REGEX_HAS_OTHER_WCHAR_T
 #  ifdef BOOST_MSVC
 #     pragma warning(push)
-#     pragma warning(disable : 4251 4231 4660)
+#     pragma warning(disable : 4251 4231)
+#     if BOOST_MSVC < 1600
+#        pragma warning(disable : 4660)
+#     endif
 #  endif
 #  if defined(_DLL) && defined(BOOST_MSVC) && (BOOST_MSVC < 1600)
 #     include <string>
@@ -222,7 +225,7 @@
  ****************************************************************************/
 
 #if defined(BOOST_MSVC) && (BOOST_MSVC >= 1200) && defined(_MSC_EXTENSIONS)
-#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED)
+#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED) || defined(BOOST_REGEX_NO_FASTCALL)
 #  define BOOST_REGEX_CALL __cdecl
 #else
 #  define BOOST_REGEX_CALL __fastcall