From 01575dccbde916c7b5153606babf4d6f06afd6a9 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Thu, 28 Jun 2001 11:45:22 +0000 Subject: [PATCH] Added some missing std:: prefixes and fixed Metroworks 7 support [SVN r10464] --- include/boost/regex/detail/regex_config.hpp | 6 +----- include/boost/regex/regex_traits.hpp | 12 ++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/boost/regex/detail/regex_config.hpp b/include/boost/regex/detail/regex_config.hpp index fd9edb14..23c6eb43 100644 --- a/include/boost/regex/detail/regex_config.hpp +++ b/include/boost/regex/detail/regex_config.hpp @@ -76,7 +76,7 @@ full list of macros and their usage. #define BOOST_RE_PLATFORM_W32 #endif -#if defined(__MWERKS__) || defined(__DECCXX) +#if (defined(__MSL_CPP__) && __MSL_CPP__ < 0x6209) || defined(__DECCXX) // no std::messages facet #define BOOST_RE_NO_MESSAGES #define BOOST_RE_NO_CAT @@ -297,10 +297,6 @@ full list of macros and their usage. #endif -#ifdef __MWERKS__ - #define BOOST_RE_NO_CAT -#endif - #ifdef __SUNPRO_CC #if (__SUNPRO_CC < 0x500) #define BOOST_RE_NO_NAMESPACES diff --git a/include/boost/regex/regex_traits.hpp b/include/boost/regex/regex_traits.hpp index c6104af9..b2901075 100644 --- a/include/boost/regex/regex_traits.hpp +++ b/include/boost/regex/regex_traits.hpp @@ -183,7 +183,7 @@ public: typedef std::string string_type; typedef int locale_type; - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::strlen(p); } @@ -267,7 +267,7 @@ public: typedef unsigned int size_type; typedef std::basic_string string_type; typedef int locale_type; - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::wcslen(p); } @@ -390,7 +390,7 @@ public: typedef std::string string_type; typedef int locale_type; - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::strlen(p); } @@ -464,7 +464,7 @@ public: typedef unsigned int size_type; typedef std::basic_string string_type; typedef int locale_type; - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::wcslen(p); } @@ -607,7 +607,7 @@ public: cpp_regex_traits(); ~cpp_regex_traits(); - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::strlen(p); } @@ -693,7 +693,7 @@ private: public: - static size_t BOOST_RE_CALL length(const char_type* p) + static std::size_t BOOST_RE_CALL length(const char_type* p) { return std::wcslen(p); }