mirror of
https://github.com/boostorg/regex.git
synced 2025-07-29 12:07:28 +02:00
More Sunpro std::distance fixes.
Changed Dr John Maddock to John Maddock [SVN r26793]
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
/*
|
||||
*
|
||||
* Copyright (c) 2004
|
||||
* Dr John Maddock
|
||||
* John Maddock
|
||||
*
|
||||
* Use, modification and distribution are subject to the
|
||||
* Boost Software License, Version 1.0. (See accompanying file
|
||||
@ -170,21 +170,21 @@ void test_mfc(const char&, const test_regex_search_tag&)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4244)
|
||||
#endif
|
||||
if(std::distance(s.GetString(), tstart2->first) != last_end2)
|
||||
if(boost::re_detail::distance(s.GetString(), tstart2->first) != last_end2)
|
||||
{
|
||||
BOOST_REGEX_TEST_ERROR(
|
||||
"Error in location of start of field split, found: "
|
||||
<< std::distance(s.GetString(), tstart2->first)
|
||||
<< boost::re_detail::distance(s.GetString(), tstart2->first)
|
||||
<< ", expected: "
|
||||
<< last_end2
|
||||
<< ".", char);
|
||||
}
|
||||
int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
|
||||
if(std::distance(s.GetString(), tstart2->second) != expected_end)
|
||||
if(boost::re_detail::distance(s.GetString(), tstart2->second) != expected_end)
|
||||
{
|
||||
BOOST_REGEX_TEST_ERROR(
|
||||
"Error in location of end2 of field split, found: "
|
||||
<< std::distance(s.GetString(), tstart2->second)
|
||||
<< boost::re_detail::distance(s.GetString(), tstart2->second)
|
||||
<< ", expected: "
|
||||
<< expected_end
|
||||
<< ".", char);
|
||||
@ -348,21 +348,21 @@ void test_mfc(const wchar_t&, const test_regex_search_tag&)
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable:4244)
|
||||
#endif
|
||||
if(std::distance(s.GetString(), tstart2->first) != last_end2)
|
||||
if(boost::re_detail::distance(s.GetString(), tstart2->first) != last_end2)
|
||||
{
|
||||
BOOST_REGEX_TEST_ERROR(
|
||||
"Error in location of start of field split, found: "
|
||||
<< std::distance(s.GetString(), tstart2->first)
|
||||
<< boost::re_detail::distance(s.GetString(), tstart2->first)
|
||||
<< ", expected: "
|
||||
<< last_end2
|
||||
<< ".", wchar_t);
|
||||
}
|
||||
int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
|
||||
if(std::distance(s.GetString(), tstart2->second) != expected_end)
|
||||
if(boost::re_detail::distance(s.GetString(), tstart2->second) != expected_end)
|
||||
{
|
||||
BOOST_REGEX_TEST_ERROR(
|
||||
"Error in location of end2 of field split, found: "
|
||||
<< std::distance(s.GetString(), tstart2->second)
|
||||
<< boost::re_detail::distance(s.GetString(), tstart2->second)
|
||||
<< ", expected: "
|
||||
<< expected_end
|
||||
<< ".", wchar_t);
|
||||
|
Reference in New Issue
Block a user