cargilld 2003/12/16 04:25:48
Modified: c/src/xercesc/util/regx RegularExpression.cpp
Log:
Change a conditional expression to an if-else to avoid a compiler problem.
Revision Changes Path
1.16 +16 -3 xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp
Index: RegularExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/regx/RegularExpression.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- RegularExpression.cpp 1 Oct 2003 16:32:40 -0000 1.15
+++ RegularExpression.cpp 16 Dec 2003 12:25:48 -0000 1.16
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.16 2003/12/16 12:25:48 cargilld
+ * Change a conditional expression to an if-else to avoid a compiler problem.
+ *
* Revision 1.15 2003/10/01 16:32:40 neilg
* improve handling of out of memory conditions, bug #23415. Thanks to David
Cargill.
*
@@ -431,9 +434,19 @@
fOptions = parseOptions(options);
fPattern = XMLString::replicate(pattern, fMemoryManager);
- RegxParser* regxParser = isSet(fOptions, XMLSCHEMA_MODE)
- ? new (fMemoryManager) ParserForXMLSchema(fMemoryManager)
- : new (fMemoryManager) RegxParser(fMemoryManager);
+ // the following construct causes an error in an Intel 7.1 32 bit compiler for
+ // red hat linux 7.2
+ // (when an exception is thrown the wrong object is deleted)
+ //RegxParser* regxParser = isSet(fOptions, XMLSCHEMA_MODE)
+ // ? new (fMemoryManager) ParserForXMLSchema(fMemoryManager)
+ // : new (fMemoryManager) RegxParser(fMemoryManager);
+ RegxParser* regxParser;
+ if (isSet(fOptions, XMLSCHEMA_MODE)) {
+ regxParser = new (fMemoryManager) ParserForXMLSchema(fMemoryManager);
+ }
+ else {
+ regxParser = new (fMemoryManager) RegxParser(fMemoryManager);
+ }
if (regxParser) {
regxParser->setTokenFactory(fTokenFactory);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
