dbertoni 2003/02/22 10:01:27
Modified: c/src/XPath XStringAdapter.cpp XStringCached.cpp
XStringReference.cpp XToken.cpp
XTokenNumberAdapter.cpp XTokenStringAdapter.cpp
XUnknown.cpp
Log:
Fix for lame Intel compiler.
Revision Changes Path
1.6 +8 -1 xml-xalan/c/src/XPath/XStringAdapter.cpp
Index: XStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XStringAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.5
+++ XStringAdapter.cpp 22 Feb 2003 18:01:27 -0000 1.6
@@ -92,7 +92,14 @@
#endif
XStringAdapter::clone(void* theAddress) const
{
- return theAddress == 0 ? new XStringAdapter(*this) : new (theAddress)
XStringAdapter(*this);
+ if (theAddress == 0)
+ {
+ return new XStringAdapter(*this);
+ }
+ else
+ {
+ return new (theAddress) XStringAdapter(*this);
+ }
}
1.8 +8 -1 xml-xalan/c/src/XPath/XStringCached.cpp
Index: XStringCached.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XStringCached.cpp 21 Nov 2002 01:26:18 -0000 1.7
+++ XStringCached.cpp 22 Feb 2003 18:01:27 -0000 1.8
@@ -97,7 +97,14 @@
#endif
XStringCached::clone(void* theAddress) const
{
- return theAddress == 0 ? new XStringCached(*this) : new (theAddress)
XStringCached(*this);
+ if (theAddress == 0)
+ {
+ return new XStringCached(*this);
+ }
+ else
+ {
+ return new (theAddress) XStringCached(*this);
+ }
}
1.7 +8 -1 xml-xalan/c/src/XPath/XStringReference.cpp
Index: XStringReference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XStringReference.cpp 21 Nov 2002 01:26:18 -0000 1.6
+++ XStringReference.cpp 22 Feb 2003 18:01:27 -0000 1.7
@@ -93,7 +93,14 @@
#endif
XStringReference::clone(void* theAddress) const
{
- return theAddress == 0 ? new XStringReference(*this) : new (theAddress)
XStringReference(*this);
+ if (theAddress == 0)
+ {
+ return new XStringReference(*this);
+ }
+ else
+ {
+ return new (theAddress) XStringReference(*this);
+ }
}
1.9 +8 -1 xml-xalan/c/src/XPath/XToken.cpp
Index: XToken.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XToken.cpp 3 Jan 2003 08:03:34 -0000 1.8
+++ XToken.cpp 22 Feb 2003 18:01:27 -0000 1.9
@@ -124,7 +124,14 @@
#endif
XToken::clone(void* theAddress) const
{
- return theAddress == 0 ? new XToken(*this) : new (theAddress)
XToken(*this);
+ if (theAddress == 0)
+ {
+ return new XToken(*this);
+ }
+ else
+ {
+ return new (theAddress) XToken(*this);
+ }
}
1.7 +8 -1 xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp
Index: XTokenNumberAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XTokenNumberAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.6
+++ XTokenNumberAdapter.cpp 22 Feb 2003 18:01:27 -0000 1.7
@@ -96,7 +96,14 @@
#endif
XTokenNumberAdapter::clone(void* theAddress) const
{
- return theAddress == 0 ? new XTokenNumberAdapter(*this) : new
(theAddress) XTokenNumberAdapter(*this);
+ if (theAddress == 0)
+ {
+ return new XTokenNumberAdapter(*this);
+ }
+ else
+ {
+ return new (theAddress) XTokenNumberAdapter(*this);
+ }
}
1.7 +8 -1 xml-xalan/c/src/XPath/XTokenStringAdapter.cpp
Index: XTokenStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XTokenStringAdapter.cpp 21 Nov 2002 01:26:18 -0000 1.6
+++ XTokenStringAdapter.cpp 22 Feb 2003 18:01:27 -0000 1.7
@@ -96,7 +96,14 @@
#endif
XTokenStringAdapter::clone(void* theAddress) const
{
- return theAddress == 0 ? new XTokenStringAdapter(*this) : new
(theAddress) XTokenStringAdapter(*this);
+ if (theAddress == 0)
+ {
+ return new XTokenStringAdapter(*this);
+ }
+ else
+ {
+ return new (theAddress) XTokenStringAdapter(*this);
+ }
}
1.16 +8 -1 xml-xalan/c/src/XPath/XUnknown.cpp
Index: XUnknown.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XUnknown.cpp 21 Nov 2002 01:26:18 -0000 1.15
+++ XUnknown.cpp 22 Feb 2003 18:01:27 -0000 1.16
@@ -105,7 +105,14 @@
#endif
XUnknown::clone(void* theAddress) const
{
- return theAddress == 0 ? new XUnknown(*this) : new (theAddress)
XUnknown(*this);
+ if (theAddress == 0)
+ {
+ return new XUnknown(*this);
+ }
+ else
+ {
+ return new (theAddress) XUnknown(*this);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
