From 75293e98544d0861bbc292d997fc9c122080b1e3 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Fri, 7 Feb 2003 12:16:40 +0000 Subject: [PATCH] Fixed by adding BOOST_REGEX_NO_EXTERNAL_TEMPLATES define and extra error checks. [SVN r17264] --- include/boost/regex/src.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/include/boost/regex/src.cpp b/include/boost/regex/src.cpp index f7458b0b..4e4f6b2a 100644 --- a/include/boost/regex/src.cpp +++ b/include/boost/regex/src.cpp @@ -19,15 +19,23 @@ * VERSION see * 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 + // // include library source files: // @@ -47,3 +55,4 @@ #include "libs/regex/src/regex_debug.cpp" #include "libs/regex/src/regex_synch.cpp" +