blautenb 2003/07/28 05:52:46
Modified: c/src/dsig DSIGReference.cpp DSIGSignature.cpp
c/src/framework XSECError.hpp XSECURIResolverXerces.cpp
c/src/utils XSECSafeBufferFormatter.cpp
XSECTXFMInputSource.cpp
c/src/utils/winutils XSECURIResolverGenericWin32.cpp
Log:
Fixed a bug with DEBUG_NEW when compiling with Xalan 1.6
Revision Changes Path
1.13 +2 -2 xml-security/c/src/dsig/DSIGReference.cpp
Index: DSIGReference.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DSIGReference.cpp 5 Jul 2003 10:30:30 -0000 1.12
+++ DSIGReference.cpp 28 Jul 2003 12:52:43 -0000 1.13
@@ -860,7 +860,7 @@
// Now create the InputStream
XSECBinTXFMInputStream * ret;
- XSECnew(ret, XSECBinTXFMInputStream(txfmChain));
+ ret = new XSECBinTXFMInputStream(txfmChain); // Probs with MSVC++
mean no XSECnew
j_txfmChain.release(); // Now owned by "ret"
return ret;
1.21 +2 -2 xml-security/c/src/dsig/DSIGSignature.cpp
Index: DSIGSignature.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DSIGSignature.cpp 5 Jul 2003 10:30:30 -0000 1.20
+++ DSIGSignature.cpp 28 Jul 2003 12:52:43 -0000 1.21
@@ -311,7 +311,7 @@
XSECBinTXFMInputStream * ret;
- XSECnew(ret, XSECBinTXFMInputStream(chain));
+ ret = new XSECBinTXFMInputStream(chain);
j_chain.release();
return ret;
1.7 +3 -3 xml-security/c/src/framework/XSECError.hpp
Index: XSECError.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECError.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSECError.hpp 5 Jul 2003 10:30:34 -0000 1.6
+++ XSECError.hpp 28 Jul 2003 12:52:43 -0000 1.7
@@ -91,8 +91,8 @@
#if defined (_WIN32) && defined (_DEBUG)
-# define XSECnew(a, b) \
- if ((a = DEBUG_NEW b) == NULL) { \
+# define XSECnew( a, b ) \
+ if (( a = DEBUG_NEW b ) == NULL) { \
throw XSECException (XSECException::MemoryAllocationFail); \
}
1.6 +2 -2 xml-security/c/src/framework/XSECURIResolverXerces.cpp
Index: XSECURIResolverXerces.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolverXerces.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECURIResolverXerces.cpp 5 Jul 2003 10:30:34 -0000 1.5
+++ XSECURIResolverXerces.cpp 28 Jul 2003 12:52:43 -0000 1.6
@@ -128,10 +128,10 @@
}
if (mp_baseURI == 0) {
- XSECnew(URLS, URLInputSource(XMLURL(uri)));
+ URLS = new URLInputSource(XMLURL(uri));
}
else {
- XSECnew(URLS, URLInputSource(XMLURL(XMLURL(mp_baseURI), uri)));
+ URLS = new URLInputSource(XMLURL(XMLURL(mp_baseURI), uri));
}
// makeStream can (and is quite likely to) throw an exception
1.6 +7 -7 xml-security/c/src/utils/XSECSafeBufferFormatter.cpp
Index: XSECSafeBufferFormatter.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBufferFormatter.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECSafeBufferFormatter.cpp 5 Jul 2003 10:30:37 -0000 1.5
+++ XSECSafeBufferFormatter.cpp 28 Jul 2003 12:52:46 -0000 1.6
@@ -114,15 +114,15 @@
const XMLFormatter::UnRepFlags
unrepFlags) {
- XSECnew(sbf, sbFormatTarget());
+ sbf = new sbFormatTarget();
sbf->setBuffer(&formatBuffer);
#if defined(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)
- XSECnew(formatter, XMLFormatter(outEncoding,
+ formatter = new XMLFormatter(outEncoding,
0,
sbf,
escapeFlags,
-
unrepFlags));
+
unrepFlags);
#else
XSECnew(formatter, XMLFormatter(outEncoding,
sbf,
@@ -140,15 +140,15 @@
const XMLFormatter::EscapeFlags
escapeFlags,
const XMLFormatter::UnRepFlags
unrepFlags) {
- XSECnew(sbf, sbFormatTarget());
+ sbf = new sbFormatTarget();
sbf->setBuffer(&formatBuffer);
#if defined(XSEC_XERCES_FORMATTER_REQUIRES_VERSION)
- XSECnew(formatter, XMLFormatter(outEncoding,
+ formatter = new XMLFormatter(outEncoding,
0,
sbf,
escapeFlags,
-
unrepFlags));
+
unrepFlags);
#else
XSECnew(formatter, XMLFormatter(outEncoding,
sbf,
1.4 +6 -2 xml-security/c/src/utils/XSECTXFMInputSource.cpp
Index: XSECTXFMInputSource.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/utils/XSECTXFMInputSource.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSECTXFMInputSource.cpp 5 Jul 2003 10:30:37 -0000 1.3
+++ XSECTXFMInputSource.cpp 28 Jul 2003 12:52:46 -0000 1.4
@@ -67,6 +67,9 @@
* $Id$
*
* $Log$
+ * Revision 1.4 2003/07/28 12:52:46 blautenb
+ * Fixed a bug with DEBUG_NEW when compiling with Xalan 1.6
+ *
* Revision 1.3 2003/07/05 10:30:37 blautenb
* Copyright update
*
@@ -113,7 +116,8 @@
XSECBinTXFMInputStream * ret;
- XSECnew(ret, XSECBinTXFMInputStream(mp_chain, m_deleteWhenDone));
+ // Have to do direct due to strange issues with MSVC++ and DEBUG_NEW
+ ret = new XSECBinTXFMInputStream(mp_chain, m_deleteWhenDone);
return ret;
1.6 +8 -5
xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp
Index: XSECURIResolverGenericWin32.cpp
===================================================================
RCS file:
/home/cvs/xml-security/c/src/utils/winutils/XSECURIResolverGenericWin32.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XSECURIResolverGenericWin32.cpp 5 Jul 2003 10:30:38 -0000 1.5
+++ XSECURIResolverGenericWin32.cpp 28 Jul 2003 12:52:46 -0000 1.6
@@ -71,6 +71,9 @@
* $Id$
*
* $Log$
+ * Revision 1.6 2003/07/28 12:52:46 blautenb
+ * Fixed a bug with DEBUG_NEW when compiling with Xalan 1.6
+ *
* Revision 1.5 2003/07/05 10:30:38 blautenb
* Copyright update
*
@@ -202,15 +205,15 @@
XSECnew(xmluri, XMLUri(turi, &(r[index])));
#else
- XSECnew(turi, XMLUri(mp_baseURI));
+ turi = new XMLUri(mp_baseURI);
Janitor<XMLUri> j_turi(turi);
- XSECnew(xmluri, XMLUri(turi, uri));
+ xmluri = new XMLUri(turi, uri);
#endif
}
else {
- XSECnew(xmluri, XMLUri(uri));
+ xmluri = new XMLUri(uri);
}
Janitor<XMLUri> j_xmluri(xmluri);
@@ -252,7 +255,7 @@
// Pass straight to our local XSECBinHTTPUriInputStream
XSECBinHTTPURIInputStream *ret;
- XSECnew(ret, XSECBinHTTPURIInputStream(*xmluri));
+ ret = new XSECBinHTTPURIInputStream(*xmluri);
return ret;
