From 6c02074270de85d044b93aec8680d298af802730 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Tue, 22 Jun 2004 12:34:04 +0000 Subject: [PATCH] More aCC portability fixes. [SVN r23145] --- include/boost/regex/v4/cregex.hpp | 2 +- include/boost/regex/v4/regex_token_iterator.hpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp index 15c92b52..903aa165 100644 --- a/include/boost/regex/v4/cregex.hpp +++ b/include/boost/regex/v4/cregex.hpp @@ -252,7 +252,7 @@ public: std::string What(int i = 0)const; std::string operator[](int i)const { return What(i); } - static const unsigned int npos; + static const std::size_t npos; friend struct re_detail::pred1; friend struct re_detail::pred2; diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp index f6f944ab..e25230b9 100644 --- a/include/boost/regex/v4/regex_token_iterator.hpp +++ b/include/boost/regex/v4/regex_token_iterator.hpp @@ -23,7 +23,8 @@ #include #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\ || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \ - || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) + || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \ + || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500)) // // Borland C++ Builder 6, and Visual C++ 6, // can't cope with the array template constructor