mirror of
https://github.com/boostorg/regex.git
synced 2025-07-23 17:17:22 +02:00
Tentative MWCW fixes
[SVN r14662]
This commit is contained in:
@ -21,11 +21,13 @@
|
|||||||
* time check only.
|
* time check only.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define UNICODE
|
||||||
|
#define _UNICODE
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
#define UNICODE
|
|
||||||
#include <boost/regex.h>
|
#include <boost/regex.h>
|
||||||
|
|
||||||
#ifndef BOOST_NO_WREGEX
|
#ifndef BOOST_NO_WREGEX
|
||||||
|
@ -21,11 +21,13 @@
|
|||||||
* time check only.
|
* time check only.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define UNICODE
|
||||||
|
#define _UNICODE
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <wchar.h>
|
#include <wchar.h>
|
||||||
#define UNICODE
|
|
||||||
#include <boost/regex.h>
|
#include <boost/regex.h>
|
||||||
|
|
||||||
#ifndef BOOST_NO_WREGEX
|
#ifndef BOOST_NO_WREGEX
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <cassert>
|
||||||
#include <boost/regex.hpp>
|
#include <boost/regex.hpp>
|
||||||
#include "regress.h"
|
#include "regress.h"
|
||||||
|
|
||||||
@ -261,11 +261,14 @@ void cpp_tests(const reg_expression<C, T, A>& e, bool recurse = true)
|
|||||||
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
|
||||||
if(!recurse)
|
if(!recurse)
|
||||||
{
|
{
|
||||||
std::basic_string<char_t> s(search_text.begin(), search_text.end());
|
unsigned len = search_text.size();
|
||||||
|
const std::basic_string<char_t>& s = search_text;
|
||||||
grep_test_predicate<std::basic_string<char_t>::const_iterator, allocator_type> oi2(s.begin(), s.end());
|
grep_test_predicate<std::basic_string<char_t>::const_iterator, allocator_type> oi2(s.begin(), s.end());
|
||||||
regex_grep(oi2, s, e, flags[3]);
|
regex_grep(oi2, s, e, flags[3]);
|
||||||
grep_test_predicate<const char_t*, allocator_type> oi3(s.c_str(), s.c_str()+s.size());
|
grep_test_predicate<const char_t*, allocator_type> oi3(s.c_str(), s.c_str()+s.size());
|
||||||
regex_grep(oi3, s.c_str(), e, flags[3]);
|
regex_grep(oi3, s.c_str(), e, flags[3]);
|
||||||
|
assert(s.size() == len);
|
||||||
|
assert(s.end() - s.begin() == len);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user