--- basic_regex_creator_orig.hpp	2010-05-05 15:07:33.000000000 +0200
+++ basic_regex_creator.hpp	2010-05-05 14:59:52.000000000 +0200
@@ -769,14 +769,14 @@
       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 idstate = static_cast<const re_brace*>(state)->index;
+            if(idstate < 0)
             {
-               id = -id-1;
-               if(id >= 10000)
+               idstate = -idstate-1;
+               if(idstate >= 10000)
                {
-                  id = m_pdata->get_id(id);
-                  if(id <= 0)
+                  idstate = m_pdata->get_id(idstate);
+                  if(idstate <= 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 @@
          {
             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 idstate = static_cast<re_jump*>(state)->alt.i;
+            if(idstate > 10000)
+               idstate = m_pdata->get_id(idstate);
             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 == idstate))
                {
                   //
                   // We've found the target of the recursion, set the jump target:
@@ -833,7 +833,7 @@
                         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 == idstate)
                            next_rep_id = -1;
                         break;
                      default: