Patch for xml-security-c 1.2.1 compilation with g++ 4.1

[Russ Allbery]

g++ 4.1 requires the following patch to xml-security-c 1.2.1:

Index: xml-security-c/src/canon/XSECC14n20010315.hpp
===================================================================
--- xml-security-c.orig/src/canon/XSECC14n20010315.hpp  2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/canon/XSECC14n20010315.hpp       2006-06-26 
20:58:16.000000000 -0700
@@ -124,7 +124,7 @@ protected:
 
 private:
 
-       void XSECC14n20010315::init();
+       void init();
        bool checkRenderNameSpaceNode(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode 
*e, 
                                                                  
XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *a);
 
Index: xml-security-c/src/transformers/TXFMXPathFilter.hpp
===================================================================
--- xml-security-c.orig/src/transformers/TXFMXPathFilter.hpp    2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/transformers/TXFMXPathFilter.hpp 2006-06-26 
20:58:16.000000000 -0700
@@ -77,7 +77,7 @@ public:
        // XPathFilter unique
 
        void evaluateExprs(DSIGTransformXPathFilter::exprVectorType * exprs);
-       XSECXPathNodeList * 
TXFMXPathFilter::evaluateSingleExpr(DSIGXPathFilterExpr *expr);
+       XSECXPathNodeList * evaluateSingleExpr(DSIGXPathFilterExpr *expr);
 
        // Methods to get output data
 
Index: xml-security-c/src/dsig/DSIGKeyInfoList.hpp
===================================================================
--- xml-security-c.orig/src/dsig/DSIGKeyInfoList.hpp    2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/dsig/DSIGKeyInfoList.hpp 2006-06-26 20:58:16.000000000 
-0700
@@ -232,7 +232,7 @@ public:
         */
 
        XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * 
-               DSIGKeyInfoList::createKeyInfo(void);
+               createKeyInfo(void);
 
        /**
         * \brief Append a DSA KeyValue element 
Index: xml-security-c/src/dsig/DSIGKeyInfoValue.hpp
===================================================================
--- xml-security-c.orig/src/dsig/DSIGKeyInfoValue.hpp   2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/dsig/DSIGKeyInfoValue.hpp        2006-06-26 
20:58:16.000000000 -0700
@@ -232,7 +232,7 @@ public:
         */
        
        XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * 
-               DSIGKeyInfoValue::createBlankRSAKeyValue(const XMLCh * modulus,
+               createBlankRSAKeyValue(const XMLCh * modulus,
                        const XMLCh * exponent);
 
        /**
@@ -243,7 +243,7 @@ public:
         * @param modulus Base64 encoded value to set
         */
 
-       void DSIGKeyInfoValue::setRSAModulus(const XMLCh * modulus);
+       void setRSAModulus(const XMLCh * modulus);
 
        /**
         * \brief Set the exponent
@@ -253,7 +253,7 @@ public:
         * @param exponent Base64 encoded value to set
         */
 
-       void DSIGKeyInfoValue::setRSAExponent(const XMLCh * exponent);
+       void setRSAExponent(const XMLCh * exponent);
 
        //@}
 
Index: xml-security-c/src/dsig/DSIGReference.hpp
===================================================================
--- xml-security-c.orig/src/dsig/DSIGReference.hpp      2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/dsig/DSIGReference.hpp   2006-06-26 20:58:16.000000000 
-0700
@@ -385,7 +385,7 @@ public:
         * transforms.
         */
 
-       static TXFMChain * DSIGReference::createTXFMChainFromList(TXFMBase * 
input, 
+       static TXFMChain * createTXFMChainFromList(TXFMBase * input, 
                                                        DSIGTransformList * 
lst);
 
        /**
Index: xml-security-c/src/dsig/DSIGTransformC14n.hpp
===================================================================
--- xml-security-c.orig/src/dsig/DSIGTransformC14n.hpp  2006-06-26 
20:56:03.000000000 -0700
+++ xml-security-c/src/dsig/DSIGTransformC14n.hpp       2006-06-26 
20:58:16.000000000 -0700
@@ -187,7 +187,7 @@ public:
         * @param ns The (space separated) list of prefixes to set.
         */
 
-       void DSIGTransformC14n::setInclusiveNamespaces(XMLCh * ns);
+       void setInclusiveNamespaces(XMLCh * ns);
        
        /**
         * \brief Get the string containing the inclusive namespaces.
Index: xml-security-c/src/xkms/impl/XKMSResultTypeImpl.hpp
===================================================================
--- xml-security-c.orig/src/xkms/impl/XKMSResultTypeImpl.hpp    2006-06-26 
20:58:32.000000000 -0700
+++ xml-security-c/src/xkms/impl/XKMSResultTypeImpl.hpp 2006-06-26 
20:58:44.000000000 -0700
@@ -53,7 +53,7 @@ public:
        void load(void);
 
        XERCES_CPP_NAMESPACE_QUALIFIER DOMElement * 
-               XKMSResultTypeImpl::createBlankResultType(
+               createBlankResultType(
                const XMLCh * tag,
                const XMLCh * service,
                const XMLCh * id,

-- 
Russ Allbery ([EMAIL PROTECTED])             <http://www.eyrie.org/~eagle/>