Moved signature classes into own namespace.

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

diff --git a/xmltooling/XMLObject.h b/xmltooling/XMLObject.h
index 46157b8..89466a5 100644 (file)
--- a/xmltooling/XMLObject.h
+++ b/xmltooling/XMLObject.h
@@ -32,6 +32,13 @@
 \r
 using namespace xercesc;\r
 \r
+#ifndef XMLTOOLING_NO_XMLSEC\r
+namespace xmlsignature {\r
+    class XMLTOOL_API Signature;\r
+    class XMLTOOL_API SigningContext;\r
+};\r
+#endif\r
+\r
 #if defined (_MSC_VER)\r
     #pragma warning( push )\r
     #pragma warning( disable : 4250 4251 )\r
@@ -39,11 +46,6 @@ using namespace xercesc;
 \r
 namespace xmltooling {\r
 \r
-#ifndef XMLTOOLING_NO_XMLSEC\r
-    class XMLTOOL_API Signature;\r
-    class XMLTOOL_API SigningContext;\r
-#endif\r
-\r
     /**\r
      * Supplies additional information to the marshalling process.\r
      * Currently this only consists of signature related information.\r
@@ -65,12 +67,12 @@ namespace xmltooling {
          * @param sig   a signature object\r
          * @param ctx   the signing context to associate with the signature \r
          */\r
-        MarshallingContext(Signature* sig, const SigningContext* ctx) {\r
+        MarshallingContext(xmlsignature::Signature* sig, const 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<Signature*,const SigningContext*> > m_signingContexts;\r
+        std::vector< std::pair<xmlsignature::Signature*,const xmlsignature::SigningContext*> > m_signingContexts;\r
 #endif\r
     };\r
 \r