mirror of
https://github.com/boostorg/regex.git
synced 2025-07-13 12:26:37 +02:00
regex: tweeks for linux. + Beos: compiler status
[SVN r8445]
This commit is contained in:
@ -288,9 +288,13 @@ Do not change this file unless you really really have to, add options to
|
|||||||
#define BOOST_RE_NO_WCSTRING
|
#define BOOST_RE_NO_WCSTRING
|
||||||
#endif
|
#endif
|
||||||
//
|
//
|
||||||
// for now we'll always define these:
|
// for now we'll always define these
|
||||||
|
// unless we know that the platform can cope
|
||||||
|
// with woide character strings:
|
||||||
|
#if !defined(linux)
|
||||||
#define BOOST_RE_NO_WCTYPE_H
|
#define BOOST_RE_NO_WCTYPE_H
|
||||||
#define BOOST_RE_NO_WCSTRING
|
#define BOOST_RE_NO_WCSTRING
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1257,5 +1261,6 @@ namespace std{
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -436,7 +436,11 @@ std::string BOOST_RE_CALL to_narrow(const std::basic_string<wchar_t>& is, const
|
|||||||
scoped_array<char> t(pc);
|
scoped_array<char> t(pc);
|
||||||
//typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
|
//typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
|
||||||
//const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
|
//const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
|
||||||
|
#ifdef BOOST_MSVC
|
||||||
std::mbstate_t state = 0;
|
std::mbstate_t state = 0;
|
||||||
|
#else
|
||||||
|
std::mbstate_t state = std::mbstate_t();
|
||||||
|
#endif
|
||||||
|
|
||||||
const wchar_t* next_in;
|
const wchar_t* next_in;
|
||||||
char* next_out;
|
char* next_out;
|
||||||
@ -474,7 +478,12 @@ std::wstring BOOST_RE_CALL to_wide(const std::string& is, const std::codecvt<wch
|
|||||||
scoped_array<wchar_t> t(pc);
|
scoped_array<wchar_t> t(pc);
|
||||||
//typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
|
//typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
|
||||||
//const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
|
//const cvt_type& cvt = BOOST_RE_USE_FACET(l, cvt_type);
|
||||||
|
#ifdef BOOST_MSVC
|
||||||
std::mbstate_t state = 0;
|
std::mbstate_t state = 0;
|
||||||
|
#else
|
||||||
|
std::mbstate_t state = std::mbstate_t();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
wchar_t* next_out;
|
wchar_t* next_out;
|
||||||
const char* next_in;
|
const char* next_in;
|
||||||
|
Reference in New Issue
Block a user