You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2005/02/25 23:21:46 UTC
cvs commit: xml-security/c/src/framework XSECDefs.hpp XSECW32Config.hpp
blautenb 2005/02/25 14:21:46
Modified: c/src/dsig DSIGXPathHere.cpp
c/src/framework XSECDefs.hpp XSECW32Config.hpp
Log:
Fix compile against Xalan 1.9 under Windows
Revision Changes Path
1.9 +6 -1 xml-security/c/src/dsig/DSIGXPathHere.cpp
Index: DSIGXPathHere.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathHere.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DSIGXPathHere.cpp 3 Feb 2005 12:56:37 -0000 1.8
+++ DSIGXPathHere.cpp 25 Feb 2005 22:21:46 -0000 1.9
@@ -27,6 +27,11 @@
#ifndef XSEC_NO_XPATH
+#if defined XSEC_XALAN_REQS_MEMORYMANAGER
+// Xalan 1.9 and above
+ XALAN_USING_XALAN(XalanCopyConstruct);
+#endif
+
DSIGXPathHere::DSIGXPathHere() {
XalanHereNode = NULL;
1.12 +2 -2 xml-security/c/src/framework/XSECDefs.hpp
Index: XSECDefs.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECDefs.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XSECDefs.hpp 3 Feb 2005 13:26:30 -0000 1.11
+++ XSECDefs.hpp 25 Feb 2005 22:21:46 -0000 1.12
@@ -108,7 +108,7 @@
// Microsoft VC++
-# pragma warning(disable: 4127 4251 4511 4512 4514 4702 4710 4711 4786 4097; error: 4150 4172 4238 4239 4715)
+# pragma warning(disable: 4127 4251 4511 4503 4512 4514 4702 4710 4711 4786 4097; error: 4150 4172 4238 4239 4715)
# define XSEC_NO_COVARIANT_RETURN_TYPE
/*
* Removed to allow any compiler to compile - might not work, but ....
1.25 +4 -4 xml-security/c/src/framework/XSECW32Config.hpp
Index: XSECW32Config.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECW32Config.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XSECW32Config.hpp 20 Feb 2005 10:37:30 -0000 1.24
+++ XSECW32Config.hpp 25 Feb 2005 22:21:46 -0000 1.25
@@ -82,16 +82,16 @@
# include <xalanc/Include/XalanVersion.hpp>
-# if (_XALAN_VERSION_ <= 10800)
+# if (_XALAN_VERSION <= 10800)
# define XSEC_XSLEXCEPTION_RETURNS_DOMSTRING 1
# endif
-# if (_XALAN_VERSION_ >= 10900)
+# if (_XALAN_VERSION >= 10900)
/* 1.9 and above have XSLException::getType() returns XalanDOMChar *, not
XalanDOMString
*/
-# undef XSEC_XSLEXCEPTION_RETURNS_DOMSTRING 1
+# undef XSEC_XSLEXCEPTION_RETURNS_DOMSTRING
/* 1.9 and above do not take a XercesDOMSupport as input to the ctor */