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

regex: tentatively fixed regression on Win2000, suppressed some more warnings, and tweeked Rogue Wave library detection and configuration.

Browse Source 
[SVN r9157]
This commit is contained in:
John Maddock
2001-02-12 12:45:25 +00:00
parent ff022f31cf
commit 973b12c5c8
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,9 +504,20 @@ typedef unsigned long jm_uintfast32_t;
//#define BOOST_RE_NO_NOT_EQUAL //#define BOOST_RE_NO_NOT_EQUAL
#endif #endif
#elif defined(__STD_ITERATOR__) #elif defined(_RWSTD_VER)
/* Rogue Wave STL */ /* Rogue Wave STL */
// Sometimes we have a four figure version number, sometimes a
// six figure one (RW seems to omit trailing zeros from version number)
#ifndef _RWSTD_VER
#define BOOST_RWSTD_VER 0
#else
#if _RWSTD_VER < 0x10000
#define BOOST_RWSTD_VER (_RWSTD_VER << 8)
#else
#define BOOST_RWSTD_VER _RWSTD_VER
#endif
#endif
#if defined(RWSTD_NO_MEMBER_TEMPLATES) || defined(RWSTD_NO_MEM_CLASS_TEMPLATES) #if defined(RWSTD_NO_MEMBER_TEMPLATES) || defined(RWSTD_NO_MEM_CLASS_TEMPLATES)
#define BOOST_RE_NO_MEMBER_TEMPLATES #define BOOST_RE_NO_MEMBER_TEMPLATES
@ -538,7 +549,7 @@ typedef unsigned long jm_uintfast32_t;
#define BOOST_RE_NO_BOOL #define BOOST_RE_NO_BOOL
#endif #endif
#if _RWSTD_VER > 0x020000 #if BOOST_RWSTD_VER > 0x020000
#ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC #ifdef _RWSTD_NO_CLASS_PARTIAL_SPEC
#define BOOST_RE_DISTANCE(i, j, n) do { n = 0; std::distance(i, j, n); } while(false) #define BOOST_RE_DISTANCE(i, j, n) do { n = 0; std::distance(i, j, n); } while(false)
#else #else
@ -552,7 +563,7 @@ typedef unsigned long jm_uintfast32_t;
#else #else
#define BOOST_RE_DISTANCE(i, j, n) std::distance(i, j, n)do { n = 0; std::distance(i, j, n); } while(false) #define BOOST_RE_DISTANCE(i, j, n) std::distance(i, j, n)do { n = 0; std::distance(i, j, n); } while(false)
#define BOOST_RE_OUTPUT_ITERATOR(T, D) std::output_iterator #define BOOST_RE_OUTPUT_ITERATOR(T, D) std::output_iterator
#if _RWSTD_VER >= 0x0200 #if BOOST_RWSTD_VER >= 0x0200
#define BOOST_RE_INPUT_ITERATOR(T, D) std::input_iterator<T> #define BOOST_RE_INPUT_ITERATOR(T, D) std::input_iterator<T>
#else #else
#define BOOST_RE_INPUT_ITERATOR(T, D) std::input_iterator<T, D> #define BOOST_RE_INPUT_ITERATOR(T, D) std::input_iterator<T, D>
@ -592,7 +603,7 @@ typedef unsigned long jm_uintfast32_t;
#endif #endif
#define BOOST_RE_STL_DONE #define BOOST_RE_STL_DONE
#if _RWSTD_VER < 0x020100 #if BOOST_RWSTD_VER < 0x020100
#define BOOST_RE_NO_OI_ASSIGN #define BOOST_RE_NO_OI_ASSIGN
#endif #endif

3
src/cpp_regex_traits.cpp
View File

@ -544,6 +544,9 @@ struct message_data<wchar_t>
std::string error_strings[boost::REG_E_UNKNOWN+1]; std::string error_strings[boost::REG_E_UNKNOWN+1];
message_data(const std::locale& l, const std::string& regex_message_catalogue); message_data(const std::locale& l, const std::string& regex_message_catalogue);
private:
message_data(const message_data&);
message_data& operator=(const message_data&);
}; };
message_data<wchar_t>::message_data(const std::locale& l, const std::string& regex_message_catalogue) message_data<wchar_t>::message_data(const std::locale& l, const std::string& regex_message_catalogue)

8
src/w32_regex_traits.cpp
View File

@ -651,12 +651,12 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_iswclass(wchar_t c, jm_uintfast
if(c < 256) if(c < 256)
return BOOST_RE_MAKE_BOOL(re_detail::wide_unicode_classes[c] & f); return BOOST_RE_MAKE_BOOL(re_detail::wide_unicode_classes[c] & f);
WORD mask; WORD mask;
if(isPlatformNT && GetStringTypeW(CT_CTYPE1, &c, 1, &mask)) if(f & char_class_unicode)
return BOOST_RE_MAKE_BOOL(mask & f);
else if(f & char_class_unicode)
return true; return true;
else if((f & char_class_graph) == char_class_graph) else if((f & char_class_graph) == char_class_graph)
return true; return true; // all wide characters are considered "graphics"
else if(isPlatformNT && GetStringTypeW(CT_CTYPE1, &c, 1, &mask))
return BOOST_RE_MAKE_BOOL(mask & f);
return false; return false;
} }