amassari    2004/07/07 06:09:42

  Modified:    c/src/xercesc/util/regx RegularExpression.hpp
  Log:
  patch from Ray Logel [jira#1136]
  
  Revision  Changes    Path
  1.18      +8 -8      xml-xerces/c/src/xercesc/util/regx/RegularExpression.hpp
  
  Index: RegularExpression.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.hpp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- RegularExpression.hpp     13 Jan 2004 20:05:00 -0000      1.17
  +++ RegularExpression.hpp     7 Jul 2004 13:09:42 -0000       1.18
  @@ -381,8 +381,8 @@
             break;
         case Token::T_MODIFIERGROUP:
             ret = fOpFactory.createModifierOp(next, result,
  -                                     ((ModifierToken *) token)->getOptions(),
  -                                     ((ModifierToken *) token)->getOptionsMask());
  +                                     ((const ModifierToken *) token)->getOptions(),
  +                                     ((const ModifierToken *) 
token)->getOptionsMask());
             break;
         }
   
  @@ -448,7 +448,7 @@
                                                    Op* const next,
                                                    const bool reverse) {
   
  -      Token* condTok = ((ConditionToken*) token)->getConditionToken();
  +      Token* condTok = ((const ConditionToken*) token)->getConditionToken();
         Token* yesTok  = token->getChild(0);
         Token* noTok   = token->getChild(1);
         int    refNo   = token->getReferenceNo();
  @@ -632,11 +632,11 @@
     }
   
     inline bool RegularExpression::matchIgnoreCase(const XMLInt32 ch1,
  -                                               const XMLInt32 ch2)
  -{
  +                                                 const XMLInt32 ch2)
  +  {
   
  -    return (0==XMLString::compareNIString((XMLCh*)&ch1,(XMLCh*)&ch2, 1));
  -}
  +      return (0==XMLString::compareNIString((const XMLCh*)&ch1,(const XMLCh*)&ch2, 
1));
  +  }
   
   
   XERCES_CPP_NAMESPACE_END
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to