Also display the info about BibTeX databases in the TeX info panel.

[lyx.git] / boost / boost / regex / v4 / regex_traits_defaults.hpp

diff --git a/boost/boost/regex/v4/regex_traits_defaults.hpp b/boost/boost/regex/v4/regex_traits_defaults.hpp
index 5b2c6bc338c4a516c4bc87d681d1ccbbe8585b26..ca13f195dceb3be11aa6115040c8d44910efde35 100644 (file)
--- a/boost/boost/regex/v4/regex_traits_defaults.hpp
+++ b/boost/boost/regex/v4/regex_traits_defaults.hpp
@@ -84,7 +84,7 @@ inline bool is_combining<unsigned char>(unsigned char)
 {
    return false;
 }
-#ifndef __hpux // can't use WCHAR_MAX/MIN in pp-directives
+#if !defined(__hpux) && !defined(__WINSCW__) // can't use WCHAR_MAX/MIN in pp-directives
 #ifdef _MSC_VER 
 template<>
 inline bool is_combining<wchar_t>(wchar_t c)
@@ -322,7 +322,7 @@ inline const charT* get_escape_R_string()
 {
 #ifdef BOOST_MSVC
 #  pragma warning(push)
-#  pragma warning(disable:4309)
+#  pragma warning(disable:4309 4245)
 #endif
    static const charT e1[] = { '(', '?', '>', '\x0D', '\x0A', '?', 
       '|', '[', '\x0A', '\x0B', '\x0C', '\x85', '\\', 'x', '{', '2', '0', '2', '8', '}',