boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-17 14:22:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Changed checks to avoid "pointless comparison" warnings.

Browse Source 
Change preprocessor code to not use WCHAR_MAX on OSL (Tru64) systems (it's definition is not preprocessor friendly on gcc).


[SVN r28892]
This commit is contained in:
John Maddock
2005-05-14 11:49:50 +00:00
parent a48a6de286
commit 0ae6fb5796
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/regex/v4/regex_traits_defaults.hpp
View File

@ -60,7 +60,7 @@ BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining_implementation(uint_least16_
template <class charT> template <class charT>
inline bool is_combining(charT c) inline bool is_combining(charT c)
{ {
return (c < static_cast<charT>(0)) ? false : ((c > static_cast<charT>((std::numeric_limits<uint_least16_t>::max)())) ? false : is_combining_implementation(static_cast<unsigned short>(c))); return (c <= static_cast<charT>(0)) ? false : ((c >= static_cast<charT>((std::numeric_limits<uint_least16_t>::max)())) ? false : is_combining_implementation(static_cast<unsigned short>(c)));
} }
template <> template <>
inline bool is_combining<char>(char) inline bool is_combining<char>(char)
@ -83,7 +83,7 @@ inline bool is_combining<wchar_t>(wchar_t c)
{ {
return is_combining_implementation(static_cast<unsigned short>(c)); return is_combining_implementation(static_cast<unsigned short>(c));
} }
#elif !defined(__DECCXX) && defined(WCHAR_MIN) && (WCHAR_MIN == 0) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) #elif !defined(__DECCXX) && !defined(__osf__) && !defined(__OSF__) && defined(WCHAR_MIN) && (WCHAR_MIN == 0) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
#if defined(WCHAR_MAX) && (WCHAR_MAX <= USHRT_MAX) #if defined(WCHAR_MAX) && (WCHAR_MAX <= USHRT_MAX)
template<> template<>
inline bool is_combining<wchar_t>(wchar_t c) inline bool is_combining<wchar_t>(wchar_t c)
@ -94,7 +94,7 @@ inline bool is_combining<wchar_t>(wchar_t c)
template<> template<>
inline bool is_combining<wchar_t>(wchar_t c) inline bool is_combining<wchar_t>(wchar_t c)
{ {
return (c > (std::numeric_limits<uint_least16_t>::max)()) ? false : is_combining_implementation(static_cast<unsigned short>(c)); return (c >= (std::numeric_limits<uint_least16_t>::max)()) ? false : is_combining_implementation(static_cast<unsigned short>(c));
} }
#endif #endif
#endif #endif