small stuff, whitespace & consistent naming

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

diff --git a/boost/boost/regex/config.hpp b/boost/boost/regex/config.hpp
index 581327e3ebc2cd57ddb0fb226c07d9ce87cfe19a..107824d882321108729ffd2bbe45620e03ffd450 100644 (file)
--- a/boost/boost/regex/config.hpp
+++ b/boost/boost/regex/config.hpp
@@ -52,6 +52,19 @@
 #  if !defined(__CONSOLE__) && !defined(_NO_VCL)
 #     define BOOST_REGEX_USE_VCL
 #  endif
+   //
+   // if this isn't Win32 then don't automatically select link
+   // libraries:
+   //
+#  ifndef _Windows
+#     ifndef BOOST_REGEX_NO_LIB
+#        define BOOST_REGEX_NO_LIB
+#     endif
+#     ifndef BOOST_REGEX_STATIC_LINK
+#        define BOOST_REGEX_STATIC_LINK
+#     endif
+#  endif
+
 #endif
 
 /*****************************************************************************
@@ -112,8 +125,10 @@
 // If there isn't good enough wide character support then there will
 // be no wide character regular expressions:
 //
-#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)) && !defined(BOOST_NO_WREGEX)
-#  define BOOST_NO_WREGEX
+#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING))
+#  if !defined(BOOST_NO_WREGEX)
+#     define BOOST_NO_WREGEX
+#  endif
 #else
 #  if defined(__sgi) && defined(__SGI_STL_PORT)
       // STLPort on IRIX is misconfigured: <cwctype> does not compile
@@ -152,7 +167,7 @@
 
 // We don't make our templates external if the compiler
 // can't handle it:
-#if defined(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS) || defined(__ICL) || defined(__ICC)\
+#if (defined(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS) || defined(__HP_aCC) || defined(__MWERKS__) || defined(__COMO__) || defined(__ICL) || defined(__ICC))\
    && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
 #  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
 #endif
@@ -244,7 +259,7 @@ using std::distance;
 #endif
  
 #if (defined(BOOST_MSVC) || defined(__BORLANDC__)) && !defined(BOOST_REGEX_NO_LIB) && !defined(BOOST_REGEX_SOURCE)
-#  include <boost/regex/detail/regex_library_include.hpp>
+#  include <boost/regex/v3/regex_library_include.hpp>
 #endif
 
 /*****************************************************************************
@@ -628,3 +643,8 @@ inline void pointer_construct(T* p, const T& t)
 
 
 
+
+
+
+
+