Skip to content

Commit f307ef8

Browse files
committed
Turn off testing wide character regexes when not appropriate.
1 parent 31646ae commit f307ef8

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

example/timer/regex_timer.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,9 @@ int main(int argc, char**argv)
367367
}
368368

369369
#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(UNDER_CE)
370+
#if !defined(BOOST_EMBTC)
370371
#pragma comment(lib, "user32.lib")
372+
#else
373+
#pragma comment(lib, "user32.a")
374+
#endif
371375
#endif
372-
373-
374-
375-
376-
377-
378-
379-
380-
381-
382-

test/captures/captures_test.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ void test_captures(const std::string& regx, const std::string& text, T& expected
6868
}
6969
}
7070
}
71+
72+
#if !defined(BOOST_NO_WREGEX)
7173

7274
std::wstring wre(regx.begin(), regx.end());
7375
std::wstring wtext(text.begin(), text.end());
@@ -89,6 +91,8 @@ void test_captures(const std::string& regx, const std::string& text, T& expected
8991
}
9092
}
9193
}
94+
95+
#endif
9296

9397
#ifdef BOOST_HAS_ICU
9498
boost::u32regex ure = boost::make_u32regex(regx);

test/named_subexpressions/named_subexpressions_test.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ void test_named_subexpressions(charT)
106106
int cpp_main( int , char* [] )
107107
{
108108
test_named_subexpressions(char(0));
109+
#if !defined(BOOST_NO_WREGEX)
109110
test_named_subexpressions(wchar_t(0));
111+
#endif
110112
return 0;
111113
}
112114

0 commit comments

Comments
 (0)