small stuff, whitespace & consistent naming

[lyx.git] / boost / boost / regex / src.cpp

diff --git a/boost/boost/regex/src.cpp b/boost/boost/regex/src.cpp
index f7458b0b69b0c25801474d64fa8d49951cd54b71..4e4f6b2a5114ca1f19f81460754583c92c48622e 100644 (file)
--- a/boost/boost/regex/src.cpp
+++ b/boost/boost/regex/src.cpp
@@ -19,15 +19,23 @@
   *   VERSION      see <boost/version.hpp>
   *   DESCRIPTION: Includes all the regex source files, include this
   *                file only if you need to build the regex library
-  *                as a single file.  Before including this file you
-  *                must define BOOST_REGEX_NO_LIB, or include this file
+  *                as a single file.  You must include this file
   *                before any other regex header.
+  *
+  *                CAUTION: THIS FILE IS DEPRICATED AND WILL CAUSE 
+  *                UNNECESSARY CODE BLOAT.
   */
 
-#if !defined(BOOST_REGEX_NO_LIB) && defined(BOOST_REGEX_CONFIG_HPP)
-#error too late you have already included a regex header - try defining BOOST_REGEX_NO_LIB when you build
+#if (!defined(BOOST_REGEX_NO_LIB) || !defined(BOOST_REGEX_NO_EXTERNAL_TEMPLATES)) && defined(BOOST_REGEX_CONFIG_HPP)
+#error too late you have already included a regex header - make sure that you include this header before any other boost header
 #endif
 
+#define BOOST_REGEX_NO_LIB
+#define BOOST_REGEX_STATIC_LINK
+#define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
+
+#include <boost/regex.hpp>
+
 //
 // include library source files:
 //
@@ -47,3 +55,4 @@
 #include "libs/regex/src/regex_debug.cpp"
 #include "libs/regex/src/regex_synch.cpp"
 
+