diff --git a/appendix.htm b/appendix.htm index a3c25740..1e443b57 100644 --- a/appendix.htm +++ b/appendix.htm @@ -297,7 +297,7 @@ localization model, then the appropriate pre-processor symbol (BOOST_RE_LOCALE_C or BOOST_RE_LOCALE_CPP) must be defined both when you build the support library, and when you include <boost/regex.hpp> or <boost/cregex.hpp> in your code. The best way to ensure -this is to add the #define to <boost/re_detail/jm_opt.h>.

+this is to add the #define to <boost/regex/detail/regex_options.hpp>.

Providing a message catalogue:

diff --git a/build/bc55.mak b/build/bc55.mak index 45d652d5..b06d6e0d 100644 --- a/build/bc55.mak +++ b/build/bc55.mak @@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\.. !endif -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : bcb5 bcb5\bcb5re300 bcb5\bcb5re300.lib bcb5\bcb5re300m bcb5\bcb5re300m.lib bcb5\bcb5re300lm bcb5\bcb5re300lm.lib bcb5\bcb5re300l bcb5\bcb5re300l.lib diff --git a/build/bcb4.mak b/build/bcb4.mak index 0b81869d..3ab67e53 100644 --- a/build/bcb4.mak +++ b/build/bcb4.mak @@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\.. !endif -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : bcb4 bcb4\bcb4re300 bcb4\bcb4re300.lib bcb4\bcb4re300m bcb4\bcb4re300m.lib bcb4\bcb4re300v bcb4\bcb4re300v.lib bcb4\bcb4re300lv bcb4\bcb4re300lv.lib bcb4\bcb4re300lm bcb4\bcb4re300lm.lib bcb4\bcb4re300l bcb4\bcb4re300l.lib diff --git a/build/bcb5.mak b/build/bcb5.mak index 07cd161e..82155697 100644 --- a/build/bcb5.mak +++ b/build/bcb5.mak @@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\.. !endif -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : bcb5 bcb5\bcb5re300 bcb5\bcb5re300.lib bcb5\bcb5re300m bcb5\bcb5re300m.lib bcb5\bcb5re300v bcb5\bcb5re300v.lib bcb5\bcb5re300lv bcb5\bcb5re300lv.lib bcb5\bcb5re300lm bcb5\bcb5re300lm.lib bcb5\bcb5re300l bcb5\bcb5re300l.lib diff --git a/build/gcc-shared.mak b/build/gcc-shared.mak index 26144334..903bd70c 100644 --- a/build/gcc-shared.mak +++ b/build/gcc-shared.mak @@ -29,7 +29,7 @@ C1=-c -O2 -I../../../ -fPIC C2=-c -g -I../../../ -fPIC -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : gcc gcc gcc/boost_regex_shared ./gcc/libboost_regex.so gcc gcc/boost_regex_debug_shared ./gcc/libboost_regex_debug.so diff --git a/build/gcc.mak b/build/gcc.mak index 38c6f4fe..04012f47 100644 --- a/build/gcc.mak +++ b/build/gcc.mak @@ -30,7 +30,7 @@ C2=-c -g -I../../../ -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : gcc gcc gcc/boost_regex ./gcc/libboost_regex.a gcc gcc/boost_regex_debug ./gcc/libboost_regex_debug.a diff --git a/build/generic.mak b/build/generic.mak index 200ffb88..033fe504 100644 --- a/build/generic.mak +++ b/build/generic.mak @@ -26,7 +26,7 @@ C1=-c -O2 -I../../../ -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : $(DIRNAME) $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so diff --git a/build/sunpro.mak b/build/sunpro.mak index 08894e5d..2380e79a 100644 --- a/build/sunpro.mak +++ b/build/sunpro.mak @@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : sunpro sunpro/libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).a sunpro/libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).a sunpro/shared_libboost_regex$(LIBSUFFIX) sunpro/libboost_regex$(LIBSUFFIX).so sunpro/shared_libboost_regex_mt$(LIBSUFFIX) sunpro/libboost_regex_mt$(LIBSUFFIX).so @@ -238,4 +238,3 @@ libboost_regex_mt$(LIBSUFFIX)_clean_shared : sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS) sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o $(LIBS) - diff --git a/build/vc6-stlport.mak b/build/vc6-stlport.mak index 1e58843a..9a89af00 100644 --- a/build/vc6-stlport.mak +++ b/build/vc6-stlport.mak @@ -32,7 +32,7 @@ NULL=nul !ENDIF -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : main_dir vc6-stlport-re300m_dir ./vc6-stlport/vc6-stlport-re300m.lib vc6-stlport-re300dm_dir ./vc6-stlport/vc6-stlport-re300dm.lib vc6-stlport-re300dl_dir ./vc6-stlport/vc6-stlport-re300dl.lib vc6-stlport-re300l_dir ./vc6-stlport/vc6-stlport-re300l.lib vc6-stlport-re300ls_dir ./vc6-stlport/vc6-stlport-re300ls.lib vc6-stlport-re300ddl_dir ./vc6-stlport/vc6-stlport-re300ddl.lib vc6-stlport-re300ddm_dir ./vc6-stlport/vc6-stlport-re300ddm.lib diff --git a/build/vc6.mak b/build/vc6.mak index 025f4d06..547e5291 100644 --- a/build/vc6.mak +++ b/build/vc6.mak @@ -32,7 +32,7 @@ NULL=nul !ENDIF -ALL_HEADER=../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp ../../../boost/re_detail/fileiter.hpp ../../../boost/re_detail/regex_compile.hpp ../../../boost/re_detail/regex_config.hpp ../../../boost/re_detail/regex_cstring.hpp ../../../boost/re_detail/regex_format.hpp ../../../boost/re_detail/regex_kmp.hpp ../../../boost/re_detail/regex_library_include.hpp ../../../boost/re_detail/regex_match.hpp ../../../boost/re_detail/regex_options.hpp ../../../boost/re_detail/regex_raw_buffer.hpp ../../../boost/re_detail/regex_split.hpp ../../../boost/re_detail/regex_stack.hpp ../../../boost/re_detail/regex_synch.hpp +ALL_HEADER=../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/detail/fileiter.hpp ../../../boost/regex/detail/regex_compile.hpp ../../../boost/regex/detail/regex_config.hpp ../../../boost/regex/detail/regex_cstring.hpp ../../../boost/regex/detail/regex_format.hpp ../../../boost/regex/detail/regex_kmp.hpp ../../../boost/regex/detail/regex_library_include.hpp ../../../boost/regex/detail/regex_match.hpp ../../../boost/regex/detail/regex_options.hpp ../../../boost/regex/detail/regex_raw_buffer.hpp ../../../boost/regex/detail/regex_split.hpp ../../../boost/regex/detail/regex_stack.hpp ../../../boost/regex/detail/regex_synch.hpp all : main_dir vc6-re300_dir ./vc6/vc6-re300.lib vc6-re300m_dir ./vc6/vc6-re300m.lib vc6-re300d_dir ./vc6/vc6-re300d.lib vc6-re300dm_dir ./vc6/vc6-re300dm.lib vc6-re300dl_dir ./vc6/vc6-re300dl.lib vc6-re300l_dir ./vc6/vc6-re300l.lib vc6-re300ls_dir ./vc6/vc6-re300ls.lib diff --git a/configure b/configure index dc0dd690..b660a31b 100644 --- a/configure +++ b/configure @@ -3375,9 +3375,9 @@ fi # ac_all_h="" ac_all_dep="" -for file in ../../boost/re_detail/*.hpp +for file in ../../boost/regex/detail/*.hpp do - if test "$file" != '../../boost/re_detail/*.hpp'; then + if test "$file" != '../../boost/regex/detail/*.hpp'; then ac_all_h="$ac_all_h ../$file" ac_all_dep="$ac_all_dep $file" fi @@ -3773,7 +3773,7 @@ done ac_given_srcdir=$srcdir -trap 'rm -fr `echo "lib/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile ../../boost/re_detail/regex_options.hpp:jm_opt.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +trap 'rm -fr `echo "lib/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile ../../boost/regex/detail/regex_options.hpp:jm_opt.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF fi @@ -4027,14 +4027,14 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 echo "$ac_t""***" 1>&6 echo "$ac_t""$0: regex++ package tuned for use with \"${CXX}\" compiler." 1>&6 -echo "$ac_t""$0: To restore original settings - copy jm_opt.in to ../../boost/re_detail/regex_options.hpp" 1>&6 +echo "$ac_t""$0: To restore original settings - copy jm_opt.in to ../../boost/regex/detail/regex_options.hpp" 1>&6 echo "$ac_t""***" 1>&6 #post processing cleanup: -sed 's%^ *#[ ]*undef[ ][ ]*\(.*\)[ ]*$%/* #define \1 */%' ../../boost/re_detail/regex_options.hpp > jm_opt.out -cat jm_opt.out > ../../boost/re_detail/regex_options.hpp -sed 's%\(#[ ]*\)undef[ ]%\1define %' ../../boost/re_detail/regex_options.hpp > jm_opt.out -cat jm_opt.out > ../../boost/re_detail/regex_options.hpp +sed 's%^ *#[ ]*undef[ ][ ]*\(.*\)[ ]*$%/* #define \1 */%' ../../boost/regex/detail/regex_options.hpp > jm_opt.out +cat jm_opt.out > ../../boost/regex/detail/regex_options.hpp +sed 's%\(#[ ]*\)undef[ ]%\1define %' ../../boost/regex/detail/regex_options.hpp > jm_opt.out +cat jm_opt.out > ../../boost/regex/detail/regex_options.hpp rm -f jm_opt.out diff --git a/configure.in b/configure.in index 6002661a..f3c3a93d 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(../../boost/regex.hpp) -AC_CONFIG_HEADER(../../boost/re_detail/regex_options.hpp:jm_opt.in) +AC_CONFIG_HEADER(../../boost/regex/detail/regex_options.hpp:jm_opt.in) AC_DEFINE(BOOST_RE_AUTO_CONFIGURE, []) dnl Disable any caching here define([AC_CACHE_LOAD], )dnl @@ -1368,9 +1368,9 @@ fi # ac_all_h="" ac_all_dep="" -for file in ../../boost/re_detail/*.hpp +for file in ../../boost/regex/detail/*.hpp do - if test "$file" != '../../boost/re_detail/*.hpp'; then + if test "$file" != '../../boost/regex/detail/*.hpp'; then ac_all_h="$ac_all_h ../$file" ac_all_dep="$ac_all_dep $file" fi @@ -1660,14 +1660,14 @@ AC_MSG_RESULT(***) AC_OUTPUT(lib/makefile example/jgrep/makefile example/timer/makefile test/regress/makefile makefile) AC_MSG_RESULT(***) AC_MSG_RESULT($0: regex++ package tuned for use with \"${CXX}\" compiler.) -AC_MSG_RESULT($0: To restore original settings - copy jm_opt.in to ../../boost/re_detail/regex_options.hpp) +AC_MSG_RESULT($0: To restore original settings - copy jm_opt.in to ../../boost/regex/detail/regex_options.hpp) AC_MSG_RESULT(***) #post processing cleanup: -sed 's%^[ ]*#[ ]*undef[ ][ ]*\(.*\)[ ]*$%/* #define \1 */%' ../../boost/re_detail/regex_options.hpp > jm_opt.out -cat jm_opt.out > ../../boost/re_detail/regex_options.hpp -sed 's%\(#[ ]*\)undef[ ]%\1define %' ../../boost/re_detail/regex_options.hpp > jm_opt.out -cat jm_opt.out > ../../boost/re_detail/regex_options.hpp +sed 's%^[ ]*#[ ]*undef[ ][ ]*\(.*\)[ ]*$%/* #define \1 */%' ../../boost/regex/detail/regex_options.hpp > jm_opt.out +cat jm_opt.out > ../../boost/regex/detail/regex_options.hpp +sed 's%\(#[ ]*\)undef[ ]%\1define %' ../../boost/regex/detail/regex_options.hpp > jm_opt.out +cat jm_opt.out > ../../boost/regex/detail/regex_options.hpp rm -f jm_opt.out diff --git a/example/jgrep/jgrep.cpp b/example/jgrep/jgrep.cpp index 18c907c8..b6d86252 100644 --- a/example/jgrep/jgrep.cpp +++ b/example/jgrep/jgrep.cpp @@ -31,7 +31,7 @@ using std::endl; #endif #pragma hrdstop -#include +#include #include "jgrep.h" diff --git a/example/jgrep/main.cpp b/example/jgrep/main.cpp index e457e6b0..8f6f235a 100644 --- a/example/jgrep/main.cpp +++ b/example/jgrep/main.cpp @@ -32,7 +32,7 @@ using std::endl; #endif #pragma hrdstop -#include +#include #include "jgrep.h" #ifndef JM_ALGO_INCLUDED diff --git a/example/jgrep/makefile.in b/example/jgrep/makefile.in index ad103ec6..da25124e 100644 --- a/example/jgrep/makefile.in +++ b/example/jgrep/makefile.in @@ -8,7 +8,7 @@ LIBS=@LIBS@ EXE=@ac_exe_ext@ OBJ=@ac_obj_ext@ -LIBDEP=../../build/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp +LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp jgrep$(EXE) : jgrep$(OBJ) main$(OBJ) $(CXX) -o jgrep$(EXE) jgrep$(OBJ) main$(OBJ) -L../../build -lboost_regex $(LIBS) diff --git a/example/timer/makefile.in b/example/timer/makefile.in index 8aa03268..d1a7d1f3 100644 --- a/example/timer/makefile.in +++ b/example/timer/makefile.in @@ -7,7 +7,7 @@ LIBS=@LIBS@ EXE=@ac_exe_ext@ OBJ=@ac_obj_ext@ -LIBDEP=../../build/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp +LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp regex_timer$(EXE) : regex_timer$(OBJ) $(CXX) -o timer$(EXE) regex_timer$(OBJ) -L../../build -lboost_regex $(LIBS) diff --git a/example/timer/vc6-stlport.mak b/example/timer/vc6-stlport.mak index 24076f0f..2b229904 100644 --- a/example/timer/vc6-stlport.mak +++ b/example/timer/vc6-stlport.mak @@ -7,7 +7,7 @@ LIBS=/link /LIBPATH:..\..\build\vc6-stlport kernel32.lib user32.lib EXE=.exe OBJ=.obj -LIBDEP= ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp +LIBDEP= ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp regex_timer$(EXE) : regex_timer$(OBJ) $(CXX) -o timer$(EXE) regex_timer$(OBJ) $(LIBS) @@ -31,3 +31,4 @@ timer$(OBJ) : ../../../timer/timer.cpp $(LIBDEP) + diff --git a/example/timer/vc6.mak b/example/timer/vc6.mak index 919d7128..5b6bf867 100644 --- a/example/timer/vc6.mak +++ b/example/timer/vc6.mak @@ -7,7 +7,7 @@ LIBS=/link /LIBPATH:..\..\build\vc6 kernel32.lib user32.lib EXE=.exe OBJ=.obj -LIBDEP= ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp +LIBDEP= ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp regex_timer$(EXE) : regex_timer$(OBJ) $(CXX) -o timer$(EXE) regex_timer$(OBJ) $(LIBS) @@ -30,3 +30,4 @@ timer$(OBJ) : ../../../timer/timer.cpp $(LIBDEP) + diff --git a/include/boost/cregex.hpp b/include/boost/cregex.hpp index 3d25e256..527ca22b 100644 --- a/include/boost/cregex.hpp +++ b/include/boost/cregex.hpp @@ -24,7 +24,7 @@ #ifndef BOOST_RE_CREGEX_HPP #define BOOST_RE_CREGEX_HPP -#include +#include #ifdef __BORLANDC__ #if __BORLANDC__ == 0x530 diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp index 34de80de..f43699e5 100644 --- a/include/boost/regex.hpp +++ b/include/boost/regex.hpp @@ -39,16 +39,16 @@ #endif #include -#include +#include #if !defined(BOOST_RE_NO_TYPEINFO) #include #endif #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include @@ -1475,7 +1475,7 @@ iterator BOOST_RE_CALL re_is_set_member(iterator next, } // namespace boost -#include +#include namespace boost{ @@ -1491,9 +1491,9 @@ typedef match_results wcmatch; } // namespace boost -#include -#include -#include +#include +#include +#include #endif // __cplusplus diff --git a/include/boost/re_detail/fileiter.hpp b/include/boost/regex/detail/fileiter.hpp similarity index 99% rename from include/boost/re_detail/fileiter.hpp rename to include/boost/regex/detail/fileiter.hpp index 1a3637e3..dbfeddae 100644 --- a/include/boost/re_detail/fileiter.hpp +++ b/include/boost/regex/detail/fileiter.hpp @@ -25,7 +25,7 @@ #ifndef BOOST_RE_FILEITER_HPP #define BOOST_RE_FILEITER_HPP -#include +#include #if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_RE_NO_W32) #error "Sorry, can't mix with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows" diff --git a/include/boost/re_detail/regex_compile.hpp b/include/boost/regex/detail/regex_compile.hpp similarity index 100% rename from include/boost/re_detail/regex_compile.hpp rename to include/boost/regex/detail/regex_compile.hpp diff --git a/include/boost/re_detail/regex_config.hpp b/include/boost/regex/detail/regex_config.hpp similarity index 99% rename from include/boost/re_detail/regex_config.hpp rename to include/boost/regex/detail/regex_config.hpp index 8d9a7acb..bbb4b8b0 100644 --- a/include/boost/re_detail/regex_config.hpp +++ b/include/boost/regex/detail/regex_config.hpp @@ -34,11 +34,12 @@ and Microsoft Visual C++ should be auto-recognised and configured. The HP aCC an SunPro C++ compiler should also be supported - but run configure for best results. The SGI, HP, Microsoft and Rogue Wave STL's should be auto-recognised and configured. Do not change this file unless you really really have to, add options to - instead. See for a full list of macros and their usage. + instead. See for a +full list of macros and their usage. ************************************************************************/ -#include +#include #ifdef __cplusplus #include @@ -160,7 +161,7 @@ Do not change this file unless you really really have to, add options to #define BOOST_RE_IX_DECL __declspec( dllimport ) #endif #endif - #include + #include #include #include @@ -228,7 +229,7 @@ Do not change this file unless you really really have to, add options to #define BOOST_RE_IX_DECL __declspec( dllimport ) #endif #endif - #include + #include #endif diff --git a/include/boost/re_detail/regex_cstring.hpp b/include/boost/regex/detail/regex_cstring.hpp similarity index 98% rename from include/boost/re_detail/regex_cstring.hpp rename to include/boost/regex/detail/regex_cstring.hpp index 55b952fe..874d385f 100644 --- a/include/boost/re_detail/regex_cstring.hpp +++ b/include/boost/regex/detail/regex_cstring.hpp @@ -26,7 +26,7 @@ #define BOOST_REGEX_CSTRING_HPP #ifndef BOOST_REGEX_CONFIG_HPP -#include +#include #endif #include diff --git a/include/boost/re_detail/regex_format.hpp b/include/boost/regex/detail/regex_format.hpp similarity index 100% rename from include/boost/re_detail/regex_format.hpp rename to include/boost/regex/detail/regex_format.hpp diff --git a/include/boost/re_detail/regex_kmp.hpp b/include/boost/regex/detail/regex_kmp.hpp similarity index 98% rename from include/boost/re_detail/regex_kmp.hpp rename to include/boost/regex/detail/regex_kmp.hpp index b82539e6..0c1266ee 100644 --- a/include/boost/re_detail/regex_kmp.hpp +++ b/include/boost/regex/detail/regex_kmp.hpp @@ -26,7 +26,7 @@ #define BOOST_REGEX_KMP_HPP #ifdef BOOST_REGEX_CONFIG_HPP -#include +#include #endif diff --git a/include/boost/re_detail/regex_library_include.hpp b/include/boost/regex/detail/regex_library_include.hpp similarity index 100% rename from include/boost/re_detail/regex_library_include.hpp rename to include/boost/regex/detail/regex_library_include.hpp diff --git a/include/boost/re_detail/regex_match.hpp b/include/boost/regex/detail/regex_match.hpp similarity index 100% rename from include/boost/re_detail/regex_match.hpp rename to include/boost/regex/detail/regex_match.hpp diff --git a/include/boost/re_detail/regex_options.hpp b/include/boost/regex/detail/regex_options.hpp similarity index 100% rename from include/boost/re_detail/regex_options.hpp rename to include/boost/regex/detail/regex_options.hpp diff --git a/include/boost/re_detail/regex_raw_buffer.hpp b/include/boost/regex/detail/regex_raw_buffer.hpp similarity index 99% rename from include/boost/re_detail/regex_raw_buffer.hpp rename to include/boost/regex/detail/regex_raw_buffer.hpp index 552d7512..e45d1524 100644 --- a/include/boost/re_detail/regex_raw_buffer.hpp +++ b/include/boost/regex/detail/regex_raw_buffer.hpp @@ -26,7 +26,7 @@ #define BOOST_REGEX_RAW_BUFFER_HPP #ifndef BOOST_REGEX_CONFIG_HPP -#include +#include #endif namespace boost{ diff --git a/include/boost/re_detail/regex_split.hpp b/include/boost/regex/detail/regex_split.hpp similarity index 100% rename from include/boost/re_detail/regex_split.hpp rename to include/boost/regex/detail/regex_split.hpp diff --git a/include/boost/re_detail/regex_stack.hpp b/include/boost/regex/detail/regex_stack.hpp similarity index 98% rename from include/boost/re_detail/regex_stack.hpp rename to include/boost/regex/detail/regex_stack.hpp index 0cd4b585..2b3e132a 100644 --- a/include/boost/re_detail/regex_stack.hpp +++ b/include/boost/regex/detail/regex_stack.hpp @@ -26,10 +26,10 @@ #define BOOST_REGEX_STACK_HPP #ifndef BOOST_REGEX_CONFIG_HPP -#include +#include #endif #ifndef BOOST_REGEX_RAW_BUFFER_HPP -#include +#include #endif namespace boost{ diff --git a/include/boost/re_detail/regex_synch.hpp b/include/boost/regex/detail/regex_synch.hpp similarity index 98% rename from include/boost/re_detail/regex_synch.hpp rename to include/boost/regex/detail/regex_synch.hpp index f4cd254c..1b27c3b6 100644 --- a/include/boost/re_detail/regex_synch.hpp +++ b/include/boost/regex/detail/regex_synch.hpp @@ -26,7 +26,7 @@ #define BOOST_REGEX_SYNCH_HPP #ifndef BOOST_REGEX_CONFIG_HPP -#include +#include #endif #if defined(BOOST_RE_PLATFORM_W32) && defined(BOOST_RE_THREADS) diff --git a/include/boost/pattern_except.hpp b/include/boost/regex/pattern_except.hpp similarity index 96% rename from include/boost/pattern_except.hpp rename to include/boost/regex/pattern_except.hpp index 2fc8e525..9d929281 100644 --- a/include/boost/pattern_except.hpp +++ b/include/boost/regex/pattern_except.hpp @@ -23,7 +23,7 @@ #ifndef BOOST_RE_PAT_EXCEPT_HPP #define BOOST_RE_PAT_EXCEPT_HPP -#include +#include namespace boost{ diff --git a/include/boost/regex_traits.hpp b/include/boost/regex/regex_traits.hpp similarity index 99% rename from include/boost/regex_traits.hpp rename to include/boost/regex/regex_traits.hpp index b1af9b1a..dce54670 100644 --- a/include/boost/regex_traits.hpp +++ b/include/boost/regex/regex_traits.hpp @@ -24,7 +24,7 @@ #define BOOST_REGEX_TRAITS_HPP #include -#include +#include namespace boost{ diff --git a/introduction.htm b/introduction.htm index 410c76f9..5e1619b4 100644 --- a/introduction.htm +++ b/introduction.htm @@ -227,11 +227,11 @@ will attempt to extract suitable compiler configuration options from the STL used. Otherwise the library will assume that the compiler is fully compliant with the C++ standard: unless various options are defined to depreciate features not implemented by -your compiler. These options are documented in <boost/re_detail/regex_options.hpp>, +your compiler. These options are documented in <boost/regex/detail/regex_options.hpp>, if you want to add permanent configuration options add them to -<boost/re_detail/regex_options.hpp> which is provided for +<boost/regex/detail/regex_options.hpp> which is provided for this purpose - this will allow you to keep your configuration -options between library versions by retaining <boost/re_detail/regex_options.hpp>. +options between library versions by retaining <boost/regex/detail/regex_options.hpp>.

The library will encase all code inside namespace boost.

@@ -445,7 +445,7 @@ code can do. Other compiler features may be implemented (and therefore detected by configure) but known to be buggy, again in this case it may be necessary to disable the feature in order to compile regex++ to stable code. The output file from configure is -<boost>/boost/re_detail/regex_options.hpp, this file lists +<boost>/boost/regex/detail/regex_options.hpp, this file lists all the macros that can be defined to configure regex++ along with a description to illustrate their usage, experiment changing options in regex_options.hpp one at a time until you achieve the diff --git a/makefile_gen b/makefile_gen index cfc21bbf..6ead16d0 100644 --- a/makefile_gen +++ b/makefile_gen @@ -936,21 +936,21 @@ EOF # # locate all the header dependencies: -header="../../../boost/cregex.hpp ../../../boost/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex_traits.hpp" +header="../../../boost/cregex.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex.hpp ../../../boost/regex/regex_traits.hpp" -for file in ../../boost/re_detail/*.hpp +for file in ../../boost/regex/detail/*.hpp do -if test $file != '../../boost/re_detail/*.hpp'; then +if test $file != '../../boost/regex/detail/*.hpp'; then header="$header ../$file" fi done -for file in ../../boost/re_detail/*.hxx +for file in ../../boost/regex/detail/*.hxx do -if test $file != '../../boost/re_detail/*.hxx'; then +if test $file != '../../boost/regex/detail/*.hxx'; then header="$header $file" fi diff --git a/old_include/fileiter.h b/old_include/fileiter.h index d5dff800..2fa0ba37 100644 --- a/old_include/fileiter.h +++ b/old_include/fileiter.h @@ -16,7 +16,7 @@ #ifndef BOOST_FILEITER_H #define BOOST_FILEITER_H -#include +#include using boost::re_detail::directory_iterator; using boost::re_detail::file_iterator; diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp index 81cb68ae..96dfea95 100644 --- a/src/c_regex_traits.cpp +++ b/src/c_regex_traits.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "primary_transform.hpp" diff --git a/src/c_regex_traits_common.cpp b/src/c_regex_traits_common.cpp index 6cda41fd..81f3782c 100644 --- a/src/c_regex_traits_common.cpp +++ b/src/c_regex_traits_common.cpp @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include namespace boost{ diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp index 89543ab4..19f21433 100644 --- a/src/cpp_regex_traits.cpp +++ b/src/cpp_regex_traits.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include "primary_transform.hpp" diff --git a/src/cregex.cpp b/src/cregex.cpp index 61551159..b3a1ba65 100644 --- a/src/cregex.cpp +++ b/src/cregex.cpp @@ -24,7 +24,7 @@ #if !defined(BOOST_RE_NO_STRING_H) #include #include -#include +#include #include namespace boost{ diff --git a/src/fileiter.cpp b/src/fileiter.cpp index a0ba841f..ff105fab 100644 --- a/src/fileiter.cpp +++ b/src/fileiter.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #if defined(__CYGWIN__) || defined(__CYGWIN32__) #include diff --git a/src/regex_debug.cpp b/src/regex_debug.cpp index 994b6abb..7db58b27 100644 --- a/src/regex_debug.cpp +++ b/src/regex_debug.cpp @@ -21,8 +21,8 @@ */ -#include -#include +#include +#include #include #ifdef BOOST_MSVC diff --git a/src/regex_synch.cpp b/src/regex_synch.cpp index 9b39625d..6d23d874 100644 --- a/src/regex_synch.cpp +++ b/src/regex_synch.cpp @@ -20,7 +20,7 @@ * DESCRIPTION: Thread synch helper functions, for regular * expression library. */ -#include +#include namespace boost{ namespace re_detail{ diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp index b3f86ffa..64d904ac 100644 --- a/src/w32_regex_traits.cpp +++ b/src/w32_regex_traits.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #if defined(_WIN32) && !defined(BOOST_RE_NO_W32) diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp index 7fc15418..e781b73c 100644 --- a/src/wide_posix_api.cpp +++ b/src/wide_posix_api.cpp @@ -20,7 +20,7 @@ * DESCRIPTION: Implements the wide character POSIX API wrappers. */ -#include +#include #ifndef BOOST_RE_NO_WCSTRING diff --git a/template_class_ref.htm b/template_class_ref.htm index 5fc033ef..7c3e7430 100644 --- a/template_class_ref.htm +++ b/template_class_ref.htm @@ -290,7 +290,7 @@ It is provided "as is" without express or implied warranty.

Exception classes.

-

#include <boost/pat_except.hpp>

+

#include <boost/pat_except.hpp>

An instance of bad_expression is thrown whenever a bad regular expression is encountered. 

namespace boost{
 
@@ -663,7 +663,7 @@ reg_expression& assign(iterator first, iterator last, flag_type f = regbase:
 
 

 
Class regex_traits

-
#include <boost/regex_traits.hpp> 

+
#include <boost/regex/regex_traits.hpp> 

 
This is a preliminary version of the regular expression traits class, and is subject to change. 

 
The purpose of the traits class is to make it easier to customise the behaviour of reg_expression and the associated matching algorithms. Custom traits classes can handle special character sets or define additional character classes, for example one could define [[:kanji:]] as the set of all (Unicode) kanji characters. This library provides three traits classes and a wrapper class regex_traits, which inherits from one of these depending upon the default localisation model in use, class c_regex_traits encapsulates the global C locale, class w32_regex_traits encapsulates the global Win32 locale (only available on Win32 systems), and class cpp_regex_traits encapsulates the C++ locale (only provided if std::locale is supported): 

 
template <class charT> class c_regex_traits;
diff --git a/test/regress/makefile.in b/test/regress/makefile.in
index 9658d2f3..44120871 100644
--- a/test/regress/makefile.in
+++ b/test/regress/makefile.in
@@ -9,7 +9,7 @@ OBJ=@ac_obj_ext@
 
 total : @ac_regress@
 
-LIBDEP=../../build/libboost_regex.a ../../../../boost/re_detail/regex_options.hpp ../../../../boost/re_detail/regex_config.hpp
+LIBDEP=../../build/libboost_regex.a ../../../../boost/regex/detail/regex_options.hpp ../../../../boost/regex/detail/regex_config.hpp
 
 r1$(EXE) :: tests.cpp parse.cpp regress.cpp
 	$(CXX) -o r1$(EXE) $(CXXFLAGS) tests.cpp parse.cpp regress.cpp $(LIBS)
diff --git a/test/regress/regress.h b/test/regress/regress.h
index 80d32a85..4978a7b6 100644
--- a/test/regress/regress.h
+++ b/test/regress/regress.h
@@ -25,7 +25,7 @@
 #ifndef _REGRESS_H
 #define _REGRESS_H
 
-#include 
+#include 
 
 #ifdef BOOST_RE_OLD_IOSTREAM
 #include