boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-17 06:12:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

regex updates: compatability fixes for Como and sunpro compilers

Browse Source 
[SVN r9642]
This commit is contained in:
John Maddock
2001-03-26 11:09:49 +00:00
parent 1758679bd6
commit b8adb4df00
10 changed files with 119 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
configure vendored
View File

@ -2304,7 +2304,7 @@ pthread_mutex_t m;
int main() { int main() {
pthread_mutex_init(&m, NULL); pthread_mutex_init(&m, 0);
pthread_mutex_lock(&m); pthread_mutex_lock(&m);
pthread_mutex_unlock(&m); pthread_mutex_unlock(&m);
pthread_mutex_destroy(&m); pthread_mutex_destroy(&m);
@ -2832,16 +2832,24 @@ cat > conftest.$ac_ext <<EOF
#include "confdefs.h" #include "confdefs.h"
#include <locale> #include <locale>
#include <string>
#include <map>
#include "confdefs.h" #include "confdefs.h"
std::locale l; std::locale l;
//
// regex locale support also requires
// std::map to be working so we test this
// as well here:
//
std::map<std::string, std::string> m;
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
ac_have_locale='yes' ac_have_locale='yes'
@ -2863,9 +2871,9 @@ fi
if test "$enable_stl" != "no"; then if test "$enable_stl" != "no"; then
echo $ac_n "checking for <iostream>""... $ac_c" 1>&6 echo $ac_n "checking for <iostream>""... $ac_c" 1>&6
echo "configure:2867: checking for <iostream>" >&5 echo "configure:2875: checking for <iostream>" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2869 "configure" #line 2877 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iostream> #include <iostream>
@ -2881,7 +2889,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
@ -2901,9 +2909,9 @@ rm -f conftest*
fi fi
echo $ac_n "checking for std::distance""... $ac_c" 1>&6 echo $ac_n "checking for std::distance""... $ac_c" 1>&6
echo "configure:2905: checking for std::distance" >&5 echo "configure:2913: checking for std::distance" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2907 "configure" #line 2915 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -2917,7 +2925,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2921: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -2934,7 +2942,7 @@ rm -f conftest*
if test "$enable_stl" != "no" && test "$have_dist" != "yes"; then if test "$enable_stl" != "no" && test "$have_dist" != "yes"; then
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2938 "configure" #line 2946 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -2948,7 +2956,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -2974,9 +2982,9 @@ fi
if test "$enable_stl" != "no" && test "$have_si" != "yes"; then if test "$enable_stl" != "no" && test "$have_si" != "yes"; then
echo $ac_n "checking for standard iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for standard iterator syntax""... $ac_c" 1>&6
echo "configure:2978: checking for standard iterator syntax" >&5 echo "configure:2986: checking for standard iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2980 "configure" #line 2988 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -2993,7 +3001,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3017,7 +3025,7 @@ fi
if test "$enable_stl" != "no" && test "$have_si" != "yes"; then if test "$enable_stl" != "no" && test "$have_si" != "yes"; then
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3021 "configure" #line 3029 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3034,7 +3042,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3038: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3046: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3065,9 +3073,9 @@ fi
if test "$have_oi" != "yes"; then if test "$have_oi" != "yes"; then
echo $ac_n "checking for output iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for output iterator syntax""... $ac_c" 1>&6
echo "configure:3069: checking for output iterator syntax" >&5 echo "configure:3077: checking for output iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3071 "configure" #line 3079 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3080,7 +3088,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3106,9 +3114,9 @@ fi
if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then
echo $ac_n "checking for input iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for input iterator syntax""... $ac_c" 1>&6
echo "configure:3110: checking for input iterator syntax" >&5 echo "configure:3118: checking for input iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3112 "configure" #line 3120 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3121,7 +3129,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3140,7 +3148,7 @@ fi
if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then if test "$enable_stl" != "no" && test "$have_ii" != "yes"; then
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3144 "configure" #line 3152 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3153,7 +3161,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3179,9 +3187,9 @@ fi
if test "$enable_stl" != "no" && test "$have_fi" != "yes"; then if test "$enable_stl" != "no" && test "$have_fi" != "yes"; then
echo $ac_n "checking for forward iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for forward iterator syntax""... $ac_c" 1>&6
echo "configure:3183: checking for forward iterator syntax" >&5 echo "configure:3191: checking for forward iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3185 "configure" #line 3193 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3194,7 +3202,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3220,9 +3228,9 @@ fi
if test "$enable_stl" != "no" && test "$have_bi" != "yes"; then if test "$enable_stl" != "no" && test "$have_bi" != "yes"; then
echo $ac_n "checking for bidirectional iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for bidirectional iterator syntax""... $ac_c" 1>&6
echo "configure:3224: checking for bidirectional iterator syntax" >&5 echo "configure:3232: checking for bidirectional iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3226 "configure" #line 3234 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3235,7 +3243,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3239: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3261,9 +3269,9 @@ fi
if test "$enable_stl" != "no" && test "$have_ri" != "yes"; then if test "$enable_stl" != "no" && test "$have_ri" != "yes"; then
echo $ac_n "checking for random access iterator syntax""... $ac_c" 1>&6 echo $ac_n "checking for random access iterator syntax""... $ac_c" 1>&6
echo "configure:3265: checking for random access iterator syntax" >&5 echo "configure:3273: checking for random access iterator syntax" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3267 "configure" #line 3275 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <iterator> #include <iterator>
@ -3276,7 +3284,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
@ -3302,9 +3310,9 @@ fi
if test "$enable_stl" != "no"; then if test "$enable_stl" != "no"; then
echo $ac_n "checking for output iterator assignment""... $ac_c" 1>&6 echo $ac_n "checking for output iterator assignment""... $ac_c" 1>&6
echo "configure:3306: checking for output iterator assignment" >&5 echo "configure:3314: checking for output iterator assignment" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3308 "configure" #line 3316 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "confdefs.h" #include "confdefs.h"
@ -3339,7 +3347,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
@ -3475,9 +3483,9 @@ old_libs="$LIBS"
LIBS="conf2.cpp $old_libs" LIBS="conf2.cpp $old_libs"
echo $ac_n "checking for link time template merging""... $ac_c" 1>&6 echo $ac_n "checking for link time template merging""... $ac_c" 1>&6
echo "configure:3479: checking for link time template merging" >&5 echo "configure:3487: checking for link time template merging" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3481 "configure" #line 3489 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "conf2.h" #include "conf2.h"
@ -3490,7 +3498,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
@ -3514,9 +3522,9 @@ if eval "$CXX $CXXFLAGS -c conf2.cpp" && eval "ar -rc libconf2.a conf2$ac_obj_ex
LIBS="-L./ -lconf2 $old_libs" LIBS="-L./ -lconf2 $old_libs"
echo $ac_n "checking for link time template merging from archive files""... $ac_c" 1>&6 echo $ac_n "checking for link time template merging from archive files""... $ac_c" 1>&6
echo "configure:3518: checking for link time template merging from archive files" >&5 echo "configure:3526: checking for link time template merging from archive files" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3520 "configure" #line 3528 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "conf2.h" #include "conf2.h"
@ -3529,7 +3537,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
@ -3658,9 +3666,9 @@ old_libs="$LIBS"
LIBS="conf2.cpp $old_libs" LIBS="conf2.cpp $old_libs"
echo $ac_n "checking for link time template merging of switch statements""... $ac_c" 1>&6 echo $ac_n "checking for link time template merging of switch statements""... $ac_c" 1>&6
echo "configure:3662: checking for link time template merging of switch statements" >&5 echo "configure:3670: checking for link time template merging of switch statements" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3664 "configure" #line 3672 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "conf2.h" #include "conf2.h"
@ -3673,7 +3681,7 @@ int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest* rm -rf conftest*
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
@ -4054,5 +4062,6 @@ rm -f jm_opt.out

11
configure.in
View File

@ -753,7 +753,7 @@ pthread_mutex_t m;
], ],
[ [
pthread_mutex_init(&m, NULL); pthread_mutex_init(&m, 0);
pthread_mutex_lock(&m); pthread_mutex_lock(&m);
pthread_mutex_unlock(&m); pthread_mutex_unlock(&m);
pthread_mutex_destroy(&m); pthread_mutex_destroy(&m);
@ -1055,9 +1055,17 @@ AC_MSG_CHECKING(for <locale>)
AC_TRY_COMPILE( AC_TRY_COMPILE(
[ [
#include <locale> #include <locale>
#include <string>
#include <map>
#include "confdefs.h" #include "confdefs.h"
std::locale l; std::locale l;
//
// regex locale support also requires
// std::map to be working so we test this
// as well here:
//
std::map<std::string, std::string> m;
], ],
[ [
], ],
@ -1687,5 +1695,6 @@ rm -f jm_opt.out

2
include/boost/re_detail/fileiter.hpp
View File

@ -95,7 +95,7 @@ struct _fi_find_data
struct _fi_priv_data; struct _fi_priv_data;
typedef _fi_priv_data* _fi_find_handle; typedef _fi_priv_data* _fi_find_handle;
#define _fi_invalid_handle NULL #define _fi_invalid_handle 0
#define _fi_dir 1 #define _fi_dir 1
_fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindFileData); _fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindFileData);

40
include/boost/re_detail/regex_compile.hpp
View File

@ -418,7 +418,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
// always compile the first _map: // always compile the first _map:
std::memset(startmap, 0, 256); std::memset(startmap, 0, 256);
record->can_be_null = 0; record->can_be_null = 0;
compile_map(record, startmap, NULL, re_detail::mask_all); compile_map(record, startmap, 0, re_detail::mask_all);
while(record->type != re_detail::syntax_element_match) while(record->type != re_detail::syntax_element_match)
{ {
@ -432,7 +432,7 @@ void BOOST_RE_CALL reg_expression<charT, traits, Allocator>::compile_maps()
else else
{ {
record->can_be_null = 0; record->can_be_null = 0;
compile_map(record, NULL, &(record->can_be_null), re_detail::mask_all); compile_map(record, 0, &(record->can_be_null), re_detail::mask_all);
} }
record = record->next.p; record = record->next.p;
} }
@ -717,7 +717,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
jm_uintfast32_t id = traits_inst.lookup_classname(base+2, first-2); jm_uintfast32_t id = traits_inst.lookup_classname(base+2, first-2);
if(_flags & regbase::icase) if(_flags & regbase::icase)
@ -730,7 +730,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(id == 0) if(id == 0)
{ {
fail(REG_ECTYPE); fail(REG_ECTYPE);
return NULL; return 0;
} }
classes.push(id); classes.push(id);
started = true; started = true;
@ -749,7 +749,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(s.size())goto char_set_literal; if(s.size())goto char_set_literal;
} }
fail(REG_ECOLLATE); fail(REG_ECOLLATE);
return NULL; return 0;
case traits_type::syntax_equal: case traits_type::syntax_equal:
// //
// we have an equivalence class [=collating-name=] // we have an equivalence class [=collating-name=]
@ -774,7 +774,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
} }
} }
fail(REG_ECOLLATE); fail(REG_ECOLLATE);
return NULL; return 0;
case traits_type::syntax_left_word: case traits_type::syntax_left_word:
if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set)) if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
{ {
@ -782,7 +782,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
return add_simple(0, re_detail::syntax_element_word_start); return add_simple(0, re_detail::syntax_element_word_start);
} }
fail(REG_EBRACK); fail(REG_EBRACK);
return NULL; return 0;
case traits_type::syntax_right_word: case traits_type::syntax_right_word:
if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set)) if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
{ {
@ -790,7 +790,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
return add_simple(0, re_detail::syntax_element_word_end); return add_simple(0, re_detail::syntax_element_word_end);
} }
fail(REG_EBRACK); fail(REG_EBRACK);
return NULL; return 0;
default: default:
if(started == false) if(started == false)
{ {
@ -803,12 +803,12 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
} }
} }
fail(REG_EBRACK); fail(REG_EBRACK);
return NULL; return 0;
} }
if(first == last) if(first == last)
{ {
fail(REG_EBRACK); fail(REG_EBRACK);
return NULL; return 0;
} }
continue; continue;
} }
@ -836,7 +836,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if((singles.empty() == true) || (l != last_single)) if((singles.empty() == true) || (l != last_single))
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
ranges.push(singles.peek()); ranges.push(singles.peek());
if(singles.peek().size() <= 1) // leave digraphs and ligatures in place if(singles.peek().size() <= 1) // leave digraphs and ligatures in place
@ -859,7 +859,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
classes.push(traits_type::char_class_word); classes.push(traits_type::char_class_word);
started = true; started = true;
@ -870,7 +870,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
classes.push(traits_type::char_class_digit); classes.push(traits_type::char_class_digit);
started = true; started = true;
@ -881,7 +881,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
classes.push(traits_type::char_class_space); classes.push(traits_type::char_class_space);
started = true; started = true;
@ -892,7 +892,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
classes.push(traits_type::char_class_lower); classes.push(traits_type::char_class_lower);
started = true; started = true;
@ -903,7 +903,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
if(l == last_dash) if(l == last_dash)
{ {
fail(REG_ERANGE); fail(REG_ERANGE);
return NULL; return 0;
} }
classes.push(traits_type::char_class_upper); classes.push(traits_type::char_class_upper);
started = true; started = true;
@ -916,7 +916,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
case traits_type::syntax_U: case traits_type::syntax_U:
case traits_type::syntax_L: case traits_type::syntax_L:
fail(REG_EESCAPE); fail(REG_EESCAPE);
return NULL; return 0;
default: default:
c = parse_escape(first, last); c = parse_escape(first, last);
--first; --first;
@ -957,7 +957,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
++first; ++first;
} }
if(!done) if(!done)
return NULL; return 0;
re_detail::re_syntax_base* result; re_detail::re_syntax_base* result;
if(has_digraphs) if(has_digraphs)
@ -1018,7 +1018,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
#ifdef __BORLANDC__ #ifdef __BORLANDC__
_flags = f; _flags = f;
#endif #endif
return NULL; return 0;
} }
++cranges; ++cranges;
unsigned len = (re_detail::re_strlen(c1.c_str()) + 1) * sizeof(charT); unsigned len = (re_detail::re_strlen(c1.c_str()) + 1) * sizeof(charT);
@ -1091,7 +1091,7 @@ re_detail::re_syntax_base* BOOST_RE_CALL reg_expression<charT, traits, Allocator
#ifdef __BORLANDC__ #ifdef __BORLANDC__
_flags = f; _flags = f;
#endif #endif
return NULL; return 0;
} }
for(unsigned int i = 0; i < 256; ++i) for(unsigned int i = 0; i < 256; ++i)
{ {

11
include/boost/re_detail/regex_config.hpp
View File

@ -284,6 +284,7 @@ Do not change this file unless you really really have to, add options to
#define BOOST_RE_NESTED_TEMPLATE_DECL #define BOOST_RE_NESTED_TEMPLATE_DECL
#define BOOST_RE_NO_SWPRINTF #define BOOST_RE_NO_SWPRINTF
#define BOOST_RE_NO_TEMPLATE_FRIEND #define BOOST_RE_NO_TEMPLATE_FRIEND
#define BOOST_RE_NO_LOCALE_H
#endif #endif
#if defined(__HP_aCC) || defined(__hpux) #if defined(__HP_aCC) || defined(__hpux)
@ -331,6 +332,14 @@ Do not change this file unless you really really have to, add options to
# endif # endif
#endif #endif
#ifdef _REENTRANT
//
// several compilers define _REENTRANT when
// threading support is turned on:
//
#define BOOST_RE_THREADS
#endif
#endif // BOOST_RE_AUTO_CONFIGURE #endif // BOOST_RE_AUTO_CONFIGURE
#ifdef __cplusplus #ifdef __cplusplus
@ -407,7 +416,7 @@ typedef unsigned long jm_uintfast32_t;
some of these (std) some of these (std)
may be guesswork: */ may be guesswork: */
# if !defined (__SGI_STL_OWN_IOSTREAMS) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS) || defined(__STL_NO_MBSTATE_T) # if (!defined (__SGI_STL_OWN_IOSTREAMS) && !defined(__STL_USE_NEW_IOSTREAMS)) || defined (__STL_HAS_NO_NEW_IOSTREAMS) || defined (__STL_USE_NO_IOSTREAMS) || defined(__STL_NO_MBSTATE_T)
// Old IO streams: // Old IO streams:
#define BOOST_RE_NO_LOCALE_H #define BOOST_RE_NO_LOCALE_H
#define BOOST_RE_OLD_IOSTREAM #define BOOST_RE_OLD_IOSTREAM

2
include/boost/re_detail/regex_synch.hpp
View File

@ -60,7 +60,7 @@ typedef pthread_mutex_t CRITICAL_SECTION;
inline void BOOST_RE_CALL InitializeCriticalSection(CRITICAL_SECTION* ps) inline void BOOST_RE_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
{ {
pthread_mutex_init(ps, NULL); pthread_mutex_init(ps, 0);
} }
inline void BOOST_RE_CALL DeleteCriticalSection(CRITICAL_SECTION* ps) inline void BOOST_RE_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)

4
include/boost/regex.hpp
View File

@ -665,7 +665,7 @@ private:
unsigned error_code_; unsigned error_code_;
void BOOST_RE_CALL compile_maps(); void BOOST_RE_CALL compile_maps();
void BOOST_RE_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = NULL)const; void BOOST_RE_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = 0)const;
bool BOOST_RE_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const; bool BOOST_RE_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const;
bool BOOST_RE_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const; bool BOOST_RE_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
void BOOST_RE_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces); void BOOST_RE_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
@ -848,7 +848,7 @@ public:
typedef Allocator alloc_type; typedef Allocator alloc_type;
typedef BOOST_RE_MAYBE_TYPENAME REBIND_TYPE(iterator, Allocator) iterator_alloc; typedef BOOST_RE_MAYBE_TYPENAME REBIND_TYPE(iterator, Allocator) iterator_alloc;
typedef typename iterator_alloc::size_type size_type; typedef typename iterator_alloc::size_type size_type;
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || !defined(BOOST_NO_STD_ITERATOR_TRAITS) #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
typedef typename std::iterator_traits<iterator>::difference_type difference_type; typedef typename std::iterator_traits<iterator>::difference_type difference_type;
typedef typename std::iterator_traits<iterator>::value_type char_type; typedef typename std::iterator_traits<iterator>::value_type char_type;
#else #else

28
src/c_regex_traits.cpp
View File

@ -221,9 +221,9 @@ void BOOST_RE_CALL re_free_classes()
void BOOST_RE_CALL re_update_classes() void BOOST_RE_CALL re_update_classes()
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
if(*re_cls_name != std::setlocale(LC_CTYPE, NULL)) if(*re_cls_name != std::setlocale(LC_CTYPE, 0))
{ {
*re_cls_name = std::setlocale(LC_CTYPE, NULL); *re_cls_name = std::setlocale(LC_CTYPE, 0);
char buf[256]; char buf[256];
unsigned int i; unsigned int i;
for(i = 0; i < re_classes_max; ++i) for(i = 0; i < re_classes_max; ++i)
@ -265,9 +265,9 @@ void BOOST_RE_CALL re_free_collate()
void BOOST_RE_CALL re_update_collate() void BOOST_RE_CALL re_update_collate()
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
if(*re_coll_name != std::setlocale(LC_COLLATE, NULL)) if(*re_coll_name != std::setlocale(LC_COLLATE, 0))
{ {
*re_coll_name = std::setlocale(LC_COLLATE, NULL); *re_coll_name = std::setlocale(LC_COLLATE, 0);
char buf[256]; char buf[256];
unsigned int i = 400; unsigned int i = 400;
re_get_message(buf, 256, i); re_get_message(buf, 256, i);
@ -296,7 +296,7 @@ unsigned int BOOST_RE_CALL _re_get_message(char* buf, unsigned int len, unsigned
#if !defined(BOOST_RE_NO_CAT) #if !defined(BOOST_RE_NO_CAT)
if(message_cat != (nl_catd)-1) if(message_cat != (nl_catd)-1)
{ {
const char* m = catgets(message_cat, 0, id, NULL); const char* m = catgets(message_cat, 0, id, 0);
if(m) if(m)
{ {
unsigned int size = std::strlen(m) + 1; unsigned int size = std::strlen(m) + 1;
@ -329,7 +329,7 @@ void BOOST_RE_CALL re_message_update()
// //
// called whenever the global locale changes: // called whenever the global locale changes:
// //
std::string l(std::setlocale(LC_MESSAGES, NULL)); std::string l(std::setlocale(LC_MESSAGES, 0));
if(*mess_locale != l) if(*mess_locale != l)
{ {
*mess_locale = l; *mess_locale = l;
@ -547,7 +547,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_collatename(std::basic_string
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
std::string t_out; std::string t_out;
@ -604,15 +604,15 @@ void c_regex_traits<char>::update()
re_detail::cs_guard g(*re_detail::p_re_lock); re_detail::cs_guard g(*re_detail::p_re_lock);
#endif #endif
re_message_update(); re_message_update();
if(*collate_name != std::setlocale(LC_COLLATE, NULL)) if(*collate_name != std::setlocale(LC_COLLATE, 0))
{ {
do_update_collate(); do_update_collate();
*collate_name = std::setlocale(LC_COLLATE, NULL); *collate_name = std::setlocale(LC_COLLATE, 0);
} }
if(*ctype_name != std::setlocale(LC_CTYPE, NULL)) if(*ctype_name != std::setlocale(LC_CTYPE, 0))
{ {
do_update_ctype(); do_update_ctype();
*ctype_name = std::setlocale(LC_CTYPE, NULL); *ctype_name = std::setlocale(LC_CTYPE, 0);
} }
sort_type = re_detail::find_sort_syntax(&i, &sort_delim); sort_type = re_detail::find_sort_syntax(&i, &sort_delim);
} }
@ -769,7 +769,7 @@ bool BOOST_RE_CALL c_regex_traits<wchar_t>::do_lookup_collate(std::basic_string<
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
std::string t_out; std::string t_out;
@ -794,7 +794,7 @@ void BOOST_RE_CALL c_regex_traits<wchar_t>::update()
re_message_update(); re_message_update();
re_update_classes(); re_update_classes();
re_update_collate(); re_update_collate();
std::string l(std::setlocale(LC_CTYPE, NULL)); std::string l(std::setlocale(LC_CTYPE, 0));
if(*wlocale_name != l) if(*wlocale_name != l)
{ {
*wlocale_name = l; *wlocale_name = l;
@ -979,7 +979,7 @@ int BOOST_RE_CALL c_regex_traits<wchar_t>::toi(const wchar_t*& first, const wcha
jm_uintfast32_t BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last) jm_uintfast32_t BOOST_RE_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
{ {
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
len = do_lookup_class(buf.get()); len = do_lookup_class(buf.get());

6
src/fileiter.cpp
View File

@ -69,7 +69,7 @@ void mapfile::open(const char* file)
#endif #endif
if(hfile != INVALID_HANDLE_VALUE) if(hfile != INVALID_HANDLE_VALUE)
{ {
hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY, 0, 0, 0); hmap = CreateFileMapping(hfile, 0, PAGE_READONLY, 0, 0, 0);
if(hmap == INVALID_HANDLE_VALUE) if(hmap == INVALID_HANDLE_VALUE)
{ {
CloseHandle(hfile); CloseHandle(hfile);
@ -782,13 +782,13 @@ _fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindF
DIR* h = opendir(dat->root); DIR* h = opendir(dat->root);
dat->d = h; dat->d = h;
if(h != NULL) if(h != 0)
{ {
if(_fi_FindNextFile(dat, lpFindFileData)) if(_fi_FindNextFile(dat, lpFindFileData))
return dat; return dat;
} }
delete dat; delete dat;
return NULL; return 0;
} }
bool _fi_FindNextFile(_fi_find_handle dat, _fi_find_data* lpFindFileData) bool _fi_FindNextFile(_fi_find_handle dat, _fi_find_data* lpFindFileData)

10
src/w32_regex_traits.cpp
View File

@ -556,7 +556,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_collatename(std::basic_stri
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
std::string t_out; std::string t_out;
@ -596,7 +596,7 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_lookup_collate(std::basic_strin
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
std::string t_out; std::string t_out;
@ -759,7 +759,7 @@ int BOOST_RE_CALL w32_regex_traits<wchar_t>::toi(const wchar_t*& first, const wc
jm_uintfast32_t BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last) jm_uintfast32_t BOOST_RE_CALL w32_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)
{ {
std::basic_string<wchar_t> s(first, last); std::basic_string<wchar_t> s(first, last);
unsigned int len = strnarrow((char*)NULL, 0, s.c_str()); unsigned int len = strnarrow((char*)0, 0, s.c_str());
scoped_array<char> buf(new char[len]); scoped_array<char> buf(new char[len]);
strnarrow(buf.get(), len, s.c_str()); strnarrow(buf.get(), len, s.c_str());
len = do_lookup_class(buf.get()); len = do_lookup_class(buf.get());
@ -780,10 +780,10 @@ w32_regex_traits<wchar_t> w32_regex_traits<wchar_t>::init_;
unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2) unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strnarrow(char *s1, unsigned int len, const wchar_t *s2)
{ {
BOOST_RE_GUARD_STACK BOOST_RE_GUARD_STACK
unsigned int size = WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, 0, NULL, NULL); unsigned int size = WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, 0, 0, 0);
if(size > len) if(size > len)
return size; return size;
return WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, len, NULL, NULL); return WideCharToMultiByte(CP_ACP, 0, s2, -1, s1, len, 0, 0);
} }
unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2) unsigned int BOOST_RE_CALL w32_regex_traits<wchar_t>::strwiden(wchar_t *s1, unsigned int len, const char *s2)