Integrated credential resolver API with signing context.

[shibboleth/xmltooling.git] / xmltooling / XMLObject.h

diff --git a/xmltooling/XMLObject.h b/xmltooling/XMLObject.h
index 89466a5..d32d155 100644 (file)
--- a/xmltooling/XMLObject.h
+++ b/xmltooling/XMLObject.h
@@ -20,7 +20,7 @@
  * Abstract interface to objects that can be manipulated in and out of XML form. \r
  */\r
 \r
-#if !defined(__xmltooling_xmlobj_h__)\r
+#ifndef __xmltooling_xmlobj_h__\r
 #define __xmltooling_xmlobj_h__\r
 \r
 #include <set>\r
@@ -67,12 +67,12 @@ namespace xmltooling {
          * @param sig   a signature object\r
          * @param ctx   the signing context to associate with the signature \r
          */\r
-        MarshallingContext(xmlsignature::Signature* sig, const xmlsignature::SigningContext* ctx) {\r
+        MarshallingContext(xmlsignature::Signature* sig, xmlsignature::SigningContext* ctx) {\r
             m_signingContexts.push_back(std::make_pair(sig,ctx));\r
         }\r
         \r
         /** Array of signing contexts, keyed off of the associated Signature */\r
-        std::vector< std::pair<xmlsignature::Signature*,const xmlsignature::SigningContext*> > m_signingContexts;\r
+        std::vector< std::pair<xmlsignature::Signature*,xmlsignature::SigningContext*> > m_signingContexts;\r
 #endif\r
     };\r
 \r