forked from boostorg/regex
Fixes for STLPort 4.1b6,
and for gcc on platforms with <sys/type.h> [SVN r10089]
This commit is contained in:
@ -27,6 +27,7 @@
|
||||
#define BOOST_RE_NO_LIB
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/regex/src.cpp>
|
||||
|
||||
//
|
||||
// instantiate templates used:
|
||||
@ -179,22 +180,5 @@ template test_string_type regex_merge(const test_string_type&,
|
||||
#include "parse.cpp"
|
||||
#include "regress.cpp"
|
||||
|
||||
//
|
||||
// include library source files:
|
||||
//
|
||||
#ifdef BOOST_RE_LOCALE_W32
|
||||
#include "libs/regex/src/w32_regex_traits.cpp"
|
||||
#elif defined(BOOST_RE_LOCALE_C)
|
||||
#include "libs/regex/src/c_regex_traits.cpp"
|
||||
#else
|
||||
#include "libs/regex/src/cpp_regex_traits.cpp"
|
||||
#endif
|
||||
#include "libs/regex/src/c_regex_traits_common.cpp"
|
||||
#include "libs/regex/src/cregex.cpp"
|
||||
#include "libs/regex/src/fileiter.cpp"
|
||||
#include "libs/regex/src/posix_api.cpp"
|
||||
#include "libs/regex/src/regex.cpp"
|
||||
#include "libs/regex/src/regex_debug.cpp"
|
||||
#include "libs/regex/src/regex_synch.cpp"
|
||||
|
||||
|
||||
|
@ -306,11 +306,14 @@ struct debug_iterator
|
||||
}
|
||||
};
|
||||
|
||||
#if defined(__SGI_STL_PORT)
|
||||
#if defined(__SGI_STL_PORT)
|
||||
namespace std{
|
||||
template <class T>
|
||||
inline random_access_iterator_tag __STL_CALL
|
||||
__ITERATOR_CATEGORY(const debug_iterator<T>&) {
|
||||
#if __SGI_STL_PORT <= 0x400
|
||||
inline random_access_iterator_tag __STL_CALL __ITERATOR_CATEGORY(const debug_iterator<T>&) {
|
||||
#else
|
||||
inline random_access_iterator_tag __iterator_category(const debug_iterator<T>&) {
|
||||
#endif
|
||||
return random_access_iterator_tag();
|
||||
}
|
||||
}
|
||||
|
@ -39,6 +39,7 @@
|
||||
#endif
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/regex/src.cpp>
|
||||
|
||||
#ifdef BOOST_RE_NO_WCSTRING
|
||||
#error The regex library is not configured for wide character support
|
||||
@ -190,23 +191,5 @@ template test_string_type regex_merge(const test_string_type&,
|
||||
#include "parse.cpp"
|
||||
#include "regress.cpp"
|
||||
|
||||
//
|
||||
// include library source files:
|
||||
//
|
||||
#ifdef BOOST_RE_LOCALE_W32
|
||||
#include "libs/regex/src/w32_regex_traits.cpp"
|
||||
#elif defined(BOOST_RE_LOCALE_C)
|
||||
#include "libs/regex/src/c_regex_traits.cpp"
|
||||
#else
|
||||
#include "libs/regex/src/cpp_regex_traits.cpp"
|
||||
#endif
|
||||
#include "libs/regex/src/c_regex_traits_common.cpp"
|
||||
#include "libs/regex/src/cregex.cpp"
|
||||
#include "libs/regex/src/fileiter.cpp"
|
||||
#include "libs/regex/src/regex.cpp"
|
||||
#include "libs/regex/src/regex_debug.cpp"
|
||||
#include "libs/regex/src/regex_synch.cpp"
|
||||
#include "libs/regex/src/wide_posix_api.cpp"
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user