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

Fix clang warnings.

Browse Source 
Fixes #6863.

[SVN r78431]
This commit is contained in:
John Maddock
2012-05-12 08:11:01 +00:00
parent c822e00b6a
commit 543e912e14
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/boost/regex/v4/basic_regex_creator.hpp
View File

@ -517,24 +517,19 @@ re_syntax_base* basic_regex_creator<charT, traits>::append_set(
return result; return result;
} }
namespace{
template<class T> template<class T>
inline bool char_less(T t1, T t2) inline bool char_less(T t1, T t2)
{ {
return t1 < t2; return t1 < t2;
} }
template<> inline bool char_less(char t1, char t2)
inline bool char_less<char>(char t1, char t2)
{ {
return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2); return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2);
} }
template<> inline bool char_less(signed char t1, signed char t2)
inline bool char_less<signed char>(signed char t1, signed char t2)
{ {
return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2); return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2);
} }
}
template <class charT, class traits> template <class charT, class traits>
re_syntax_base* basic_regex_creator<charT, traits>::append_set( re_syntax_base* basic_regex_creator<charT, traits>::append_set(
@ -1035,7 +1030,7 @@ int basic_regex_creator<charT, traits>::calculate_backstep(re_syntax_base* state
state = rep->alt.p; state = rep->alt.p;
continue; continue;
} }
else if((state->type == syntax_element_long_set_rep)) else if(state->type == syntax_element_long_set_rep)
{ {
BOOST_ASSERT(rep->next.p->type == syntax_element_long_set); BOOST_ASSERT(rep->next.p->type == syntax_element_long_set);
if(static_cast<re_set_long<mask_type>*>(rep->next.p)->singleton == 0) if(static_cast<re_set_long<mask_type>*>(rep->next.p)->singleton == 0)
@ -1113,9 +1108,9 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
if(l_map) if(l_map)
{ {
l_map[0] |= mask_init; l_map[0] |= mask_init;
l_map['\n'] |= mask; l_map[static_cast<unsigned>('\n')] |= mask;
l_map['\r'] |= mask; l_map[static_cast<unsigned>('\r')] |= mask;
l_map['\f'] |= mask; l_map[static_cast<unsigned>('\f')] |= mask;
l_map[0x85] |= mask; l_map[0x85] |= mask;
} }
// now figure out if we can match a NULL string at this point: // now figure out if we can match a NULL string at this point:
@ -1302,8 +1297,8 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
if(l_map) if(l_map)
{ {
l_map[0] |= mask_init; l_map[0] |= mask_init;
l_map['\n'] |= mask; l_map[static_cast<unsigned>('\n')] |= mask;
l_map['\r'] |= mask; l_map[static_cast<unsigned>('\r')] |= mask;
} }
if(pnull) if(pnull)
*pnull |= mask; *pnull |= mask;
@ -1338,7 +1333,7 @@ void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state,
re_syntax_base* p = m_pdata->m_first_state; re_syntax_base* p = m_pdata->m_first_state;
while(p) while(p)
{ {
if((p->type == syntax_element_recurse)) if(p->type == syntax_element_recurse)
{ {
re_brace* p2 = static_cast<re_brace*>(static_cast<re_jump*>(p)->alt.p); re_brace* p2 = static_cast<re_brace*>(static_cast<re_jump*>(p)->alt.p);
if((p2->type == syntax_element_startmark) && (p2->index == static_cast<re_brace*>(state)->index)) if((p2->type == syntax_element_startmark) && (p2->index == static_cast<re_brace*>(state)->index))