Subject: [Boost-commit] svn:boost r51497 - sandbox/compile-in-place/Boost_1_36_0/libs/regex/src
From: doomster_at_[hidden]
Date: 2009-03-01 05:02:44
Author: eckhardt
Date: 2009-03-01 05:02:43 EST (Sun, 01 Mar 2009)
New Revision: 51497
URL: http://svn.boost.org/trac/boost/changeset/51497
Log:
- Rename c_regex_type typedef to wc_regex_type for wchar_t in order to avoid conflicts with the equally named one for char.
Text files modified:
sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wide_posix_api.cpp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
Modified: sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wide_posix_api.cpp
==============================================================================
--- sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wide_posix_api.cpp (original)
+++ sandbox/compile-in-place/Boost_1_36_0/libs/regex/src/wide_posix_api.cpp 2009-03-01 05:02:43 EST (Sun, 01 Mar 2009)
@@ -69,7 +69,7 @@
};
}
-typedef boost::basic_regex<wchar_t, c_regex_traits<wchar_t> > c_regex_type;
+typedef boost::basic_regex<wchar_t, c_regex_traits<wchar_t> > wc_regex_type;
BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
{
@@ -79,7 +79,7 @@
#ifndef BOOST_NO_EXCEPTIONS
try{
#endif
- expression->guts = new c_regex_type();
+ expression->guts = new wc_regex_type();
#ifndef BOOST_NO_EXCEPTIONS
} catch(...)
{
@@ -129,9 +129,9 @@
try{
#endif
expression->re_magic = wmagic_value;
- static_cast<c_regex_type*>(expression->guts)->set_expression(ptr, p2, flags);
- expression->re_nsub = static_cast<c_regex_type*>(expression->guts)->mark_count() - 1;
- result = static_cast<c_regex_type*>(expression->guts)->error_code();
+ static_cast<wc_regex_type*>(expression->guts)->set_expression(ptr, p2, flags);
+ expression->re_nsub = static_cast<wc_regex_type*>(expression->guts)->mark_count() - 1;
+ result = static_cast<wc_regex_type*>(expression->guts)->error_code();
#ifndef BOOST_NO_EXCEPTIONS
}
catch(const boost::regex_error& be)
@@ -210,7 +210,7 @@
{
std::string p;
if((e) && (e->re_magic == wmagic_value))
- p = static_cast<c_regex_type*>(e->guts)->get_traits().error_string(static_cast< ::boost::regex_constants::error_type>(code));
+ p = static_cast<wc_regex_type*>(e->guts)->get_traits().error_string(static_cast< ::boost::regex_constants::error_type>(code));
else
{
p = re_detail::get_default_error_string(static_cast< ::boost::regex_constants::error_type>(code));
@@ -259,7 +259,7 @@
#endif
if(expression->re_magic == wmagic_value)
{
- result = regex_search(start, end, m, *static_cast<c_regex_type*>(expression->guts), flags);
+ result = regex_search(start, end, m, *static_cast<wc_regex_type*>(expression->guts), flags);
}
else
return result;
@@ -296,7 +296,7 @@
{
if(expression->re_magic == wmagic_value)
{
- delete static_cast<c_regex_type*>(expression->guts);
+ delete static_cast<wc_regex_type*>(expression->guts);
}
expression->re_magic = 0;
}