forked from boostorg/regex
Added fixes for tests which are unsupported on some platforms.
[SVN r19548]
This commit is contained in:
@ -41,7 +41,7 @@ using std::endl;
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "jgrep.h"
|
#include "jgrep.h"
|
||||||
|
#ifndef BOOST_REGEX_NO_FILEITER
|
||||||
|
|
||||||
//
|
//
|
||||||
// class ogrep_predicate
|
// class ogrep_predicate
|
||||||
@ -146,12 +146,4 @@ void process_grep(const char* file)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -40,6 +40,7 @@ using std::endl;
|
|||||||
#include <boost/regex/v4/fileiter.hpp>
|
#include <boost/regex/v4/fileiter.hpp>
|
||||||
#endif
|
#endif
|
||||||
#include "jgrep.h"
|
#include "jgrep.h"
|
||||||
|
#ifndef BOOST_REGEX_NO_FILEITER
|
||||||
|
|
||||||
#ifndef JM_ALGO_INCLUDED
|
#ifndef JM_ALGO_INCLUDED
|
||||||
// HP and SGI STL's use <algo.h> instead
|
// HP and SGI STL's use <algo.h> instead
|
||||||
@ -282,7 +283,20 @@ int main(int argc, char * argv[])
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
int main(int argc, char * argv[])
|
||||||
|
{
|
||||||
|
std::cout <<
|
||||||
|
"\n<note>\n"
|
||||||
|
"This functionality is not available on with this compiler on this platform.\n"
|
||||||
|
"</note>\n";
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@ void class_index::IndexClasses(const std::string& file)
|
|||||||
start = file.begin();
|
start = file.begin();
|
||||||
end = file.end();
|
end = file.end();
|
||||||
base = start;
|
base = start;
|
||||||
#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) && !defined(_STLP_VERSION)
|
#if BOOST_WORKAROUND(_MSC_VER, < 1300) && !defined(_STLP_VERSION)
|
||||||
boost::regex_grep(std::bind1st(std::mem_fun1(&class_index::grep_callback), this),
|
boost::regex_grep(std::bind1st(std::mem_fun1(&class_index::grep_callback), this),
|
||||||
start,
|
start,
|
||||||
end,
|
end,
|
||||||
|
@ -28,7 +28,7 @@ int main()
|
|||||||
{
|
{
|
||||||
// VC6 and VC7 can't cope with the iterator architypes,
|
// VC6 and VC7 can't cope with the iterator architypes,
|
||||||
// don't bother testing as it doesn't work:
|
// don't bother testing as it doesn't work:
|
||||||
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
|
#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
|
||||||
typedef boost::bidirectional_iterator_archetype<char> iterator_type;
|
typedef boost::bidirectional_iterator_archetype<char> iterator_type;
|
||||||
boost::regex r;
|
boost::regex r;
|
||||||
iterator_type a, b;
|
iterator_type a, b;
|
||||||
|
@ -28,7 +28,7 @@ int main()
|
|||||||
#ifndef BOOST_NO_WREGEX
|
#ifndef BOOST_NO_WREGEX
|
||||||
// VC6 and VC7 can't cope with the iterator architypes,
|
// VC6 and VC7 can't cope with the iterator architypes,
|
||||||
// don't bother testing as it doesn't work:
|
// don't bother testing as it doesn't work:
|
||||||
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
|
#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
|
||||||
typedef boost::bidirectional_iterator_archetype<wchar_t> iterator_type;
|
typedef boost::bidirectional_iterator_archetype<wchar_t> iterator_type;
|
||||||
boost::wregex r;
|
boost::wregex r;
|
||||||
iterator_type a, b;
|
iterator_type a, b;
|
||||||
|
Reference in New Issue
Block a user