Porting fixes

diff --git a/configure.ac b/configure.ac
index 568a529..d89710b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -209,13 +209,13 @@ if test x_$with_xmlsec != x_no; then
     AC_MSG_CHECKING([XML-Security version])
     AC_PREPROC_IFELSE(
            [AC_LANG_PROGRAM([#include <xsec/utils/XSECPlatformUtils.hpp>],
-        [#if XSEC_VERSION_MAJOR > 1 || XSEC_VERSION_MEDIUM >2 
+        [#if XSEC_VERSION_MAJOR > 1 || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM > 3) || (XSEC_VERSION_MAJOR == 1 && XSEC_VERSION_MEDIUM == 3 && XSEC_VERSION_MINOR > 0)
 int i = 0;
 #else
-#error need version 1.3 or later
+#error need version 1.3.1 or later
 #endif])],
         [AC_MSG_RESULT(OK)],
-        [AC_MSG_FAILURE([XML-Security version 1.3 or greater is required.])])
+        [AC_MSG_FAILURE([XML-Security version 1.3.1 or greater is required.])])
     AC_TRY_LINK(
             [#include <xsec/utils/XSECPlatformUtils.hpp>],
             [XSECPlatformUtils::Initialise()],,

diff --git a/xmltooling/io/AbstractXMLObjectMarshaller.cpp b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
index 87e0087..c715c26 100644 (file)
--- a/xmltooling/io/AbstractXMLObjectMarshaller.cpp
+++ b/xmltooling/io/AbstractXMLObjectMarshaller.cpp
@@ -200,7 +200,7 @@ void AbstractXMLObjectMarshaller::marshallInto(
 #ifndef XMLTOOLING_NO_XMLSEC
     marshallContent(targetElement,credential);
     if (sigs) {
-        for_each(sigs->begin(),sigs->end(),bind2nd(mem_fun1<void,Signature,const Credential*>(&Signature::sign),credential));
+        for_each(sigs->begin(),sigs->end(),bind2nd(mem_fun1_t<void,Signature,const Credential*>(&Signature::sign),credential));
     }
 #else
     marshallContent(targetElement);

diff --git a/xmltooling/security/KeyInfoResolver.h b/xmltooling/security/KeyInfoResolver.h
index 56ade75..bb74477 100644 (file)
--- a/xmltooling/security/KeyInfoResolver.h
+++ b/xmltooling/security/KeyInfoResolver.h
@@ -24,13 +24,14 @@
 #define __xmltooling_keyres_h__
 
 #include <xmltooling/security/Credential.h>
-#include <xmltooling/security/CredentialCriteria.h>
 #include <xmltooling/security/KeyInfoCredentialContext.h>
 
 #include <xsec/dsig/DSIGKeyInfoList.hpp>
 
 namespace xmltooling {
 
+    class XMLTOOL_API CredentialCriteria;
+
     /**
      * Resolves credentials from KeyInfo information.
      *