X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2FXMLObject.h;fp=xmltooling%2FXMLObject.h;h=89466a527bfb53c8b8acb934096888a8d5a96221;hb=0b6e37e5bdd2eeecf576ba69e724da2f99fb64f0;hp=46157b8c9bd7ead3fea9c4883218d6f87298775c;hpb=59a03fbcf66dd9323f5549f6747edaf210e95e25;p=shibboleth%2Fcpp-xmltooling.git

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