Added fixes for tests which are unsupported on some platforms.

[SVN r19548]
This commit is contained in:
John Maddock
2003-08-12 12:03:25 +00:00
parent 4e412a1774
commit ccc9c16e93
5 changed files with 20 additions and 14 deletions

View File

@ -41,7 +41,7 @@ using std::endl;
#endif
#include "jgrep.h"
#ifndef BOOST_REGEX_NO_FILEITER
//
// class ogrep_predicate
@ -146,12 +146,4 @@ void process_grep(const char* file)
}
}
#endif

View File

@ -40,6 +40,7 @@ using std::endl;
#include <boost/regex/v4/fileiter.hpp>
#endif
#include "jgrep.h"
#ifndef BOOST_REGEX_NO_FILEITER
#ifndef JM_ALGO_INCLUDED
// HP and SGI STL's use <algo.h> instead
@ -282,7 +283,20 @@ int main(int argc, char * argv[])
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

View File

@ -88,7 +88,7 @@ void class_index::IndexClasses(const std::string& file)
start = file.begin();
end = file.end();
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),
start,
end,

View File

@ -28,7 +28,7 @@ int main()
{
// VC6 and VC7 can't cope with the iterator architypes,
// 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;
boost::regex r;
iterator_type a, b;

View File

@ -28,7 +28,7 @@ int main()
#ifndef BOOST_NO_WREGEX
// VC6 and VC7 can't cope with the iterator architypes,
// 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;
boost::wregex r;
iterator_type a, b;