summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-07-10 22:38:04 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-07-10 22:38:04 (GMT)
commit562eac542159f5ae1fe74eb2e21ee79aa3bc8929 (patch)
tree3742ab1fae806b6037539a2f3bf10f0fcd2cf266
parent34ecfccfcdabf268c63c8dc2c36b792d5bea16c8 (diff)
downloadswift-contrib-562eac542159f5ae1fe74eb2e21ee79aa3bc8929.zip
swift-contrib-562eac542159f5ae1fe74eb2e21ee79aa3bc8929.tar.bz2
Boost patch to allow compilation in Objective-C
-rw-r--r--3rdParty/Boost/src/boost/regex/v4/basic_regex_creator.hpp22
-rw-r--r--3rdParty/Boost/src/boost/regex/v4/perl_matcher_common.hpp8
2 files changed, 15 insertions, 15 deletions
diff --git a/3rdParty/Boost/src/boost/regex/v4/basic_regex_creator.hpp b/3rdParty/Boost/src/boost/regex/v4/basic_regex_creator.hpp
index ee207d0..883ecf1 100644
--- a/3rdParty/Boost/src/boost/regex/v4/basic_regex_creator.hpp
+++ b/3rdParty/Boost/src/boost/regex/v4/basic_regex_creator.hpp
@@ -769,14 +769,14 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
case syntax_element_assert_backref:
{
// just check that the index is valid:
- int id = static_cast<const re_brace*>(state)->index;
- if(id < 0)
+ int idVar = static_cast<const re_brace*>(state)->index;
+ if(idVar < 0)
{
- id = -id-1;
- if(id >= 10000)
+ idVar = -idVar-1;
+ if(idVar >= 10000)
{
- id = m_pdata->get_id(id);
- if(id <= 0)
+ idVar = m_pdata->get_id(idVar);
+ if(idVar <= 0)
{
// check of sub-expression that doesn't exist:
if(0 == this->m_pdata->m_status) // update the error code if not already set
@@ -804,12 +804,12 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
{
bool ok = false;
re_syntax_base* p = base;
- int id = static_cast<re_jump*>(state)->alt.i;
- if(id > 10000)
- id = m_pdata->get_id(id);
+ int idVar = static_cast<re_jump*>(state)->alt.i;
+ if(idVar > 10000)
+ idVar = m_pdata->get_id(idVar);
while(p)
{
- if((p->type == syntax_element_startmark) && (static_cast<re_brace*>(p)->index == id))
+ if((p->type == syntax_element_startmark) && (static_cast<re_brace*>(p)->index == idVar))
{
//
// We've found the target of the recursion, set the jump target:
@@ -833,7 +833,7 @@ void basic_regex_creator<charT, traits>::fixup_recursions(re_syntax_base* state)
next_rep_id = static_cast<re_repeat*>(p)->state_id;
break;
case syntax_element_endmark:
- if(static_cast<const re_brace*>(p)->index == id)
+ if(static_cast<const re_brace*>(p)->index == idVar)
next_rep_id = -1;
break;
default:
diff --git a/3rdParty/Boost/src/boost/regex/v4/perl_matcher_common.hpp b/3rdParty/Boost/src/boost/regex/v4/perl_matcher_common.hpp
index fd439f8..5da53c5 100644
--- a/3rdParty/Boost/src/boost/regex/v4/perl_matcher_common.hpp
+++ b/3rdParty/Boost/src/boost/regex/v4/perl_matcher_common.hpp
@@ -732,10 +732,10 @@ inline bool perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref(
{
// Have we recursed into subexpression "index"?
// If index == 0 then check for any recursion at all, otherwise for recursion to -index-1.
- int id = -index-1;
- if(id >= 10000)
- id = re.get_data().get_id(id);
- result = recursion_stack_position && ((recursion_stack[recursion_stack_position-1].id == id) || (index == 0));
+ int idVar = -index-1;
+ if(idVar >= 10000)
+ idVar = re.get_data().get_id(idVar);
+ result = recursion_stack_position && ((recursion_stack[recursion_stack_position-1].id == idVar) || (index == 0));
pstate = pstate->next.p;
}
return result;