Author: scantor
Date: Wed Jun 21 21:28:28 2017
New Revision: 1799517
URL: http://svn.apache.org/viewvc?rev=1799517&view=rev
Log:
Port XERCESC-1925 from 3.1 branch.
Modified:
xerces/c/trunk/ (props changed)
xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
Propchange: xerces/c/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 21 21:28:28 2017
@@ -1 +1 @@
-/xerces/c/branches/xerces-3.1:1662879,1662887
+/xerces/c/branches/xerces-3.1:1662879,1662887,1662893
Modified: xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp?rev=1799517&r1=1799516&r2=1799517&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/regx/RegularExpression.cpp Wed Jun 21
21:28:28 2017
@@ -1597,7 +1597,7 @@ bool RegularExpression::doTokenOverlap(c
{
try
{
- RangeToken tempRange(Token::T_RANGE, fMemoryManager);
+ RangeToken tempRange(t1->getTokenType(), fMemoryManager);
tempRange.mergeRanges(t1);
tempRange.intersectRanges((RangeToken*)token);
return !tempRange.empty();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
