Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / impl / UnknownElement.cpp

diff --git a/xmltooling/impl/UnknownElement.cpp b/xmltooling/impl/UnknownElement.cpp
index bf5ed9c..af4d12e 100644 (file)
--- a/xmltooling/impl/UnknownElement.cpp
+++ b/xmltooling/impl/UnknownElement.cpp
@@ -22,18 +22,21 @@
 
 #include "internal.h"
 #include "exceptions.h"
+#include "logging.h"
 #include "impl/UnknownElement.h"
 #include "util/NDC.h"
 #include "util/XMLHelper.h"
 
-#include <log4cpp/Category.hh>
 #include <xercesc/framework/MemBufInputSource.hpp>
 #include <xercesc/framework/Wrapper4InputSource.hpp>
 #include <xercesc/util/XMLUniDefs.hpp>
 
+using namespace xmltooling::logging;
 using namespace xmltooling;
-using namespace log4cpp;
 using namespace std;
+#ifndef XMLTOOLING_NO_XMLSEC
+using xmlsignature::Signature;
+#endif
 
 void UnknownElementImpl::releaseDOM() const
 {
@@ -73,7 +76,8 @@ void UnknownElementImpl::serialize(string& s) const
 DOMElement* UnknownElementImpl::marshall(
     DOMDocument* document
 #ifndef XMLTOOLING_NO_XMLSEC
-    ,const std::vector<xmlsignature::Signature*>* sigs
+    ,const vector<Signature*>* sigs
+    ,const Credential* credential
 #endif
     ) const
 {
@@ -140,7 +144,8 @@ DOMElement* UnknownElementImpl::marshall(
 DOMElement* UnknownElementImpl::marshall(
     DOMElement* parentElement
 #ifndef XMLTOOLING_NO_XMLSEC
-    ,const std::vector<xmlsignature::Signature*>* sigs
+    ,const vector<Signature*>* sigs
+    ,const Credential* credential
 #endif
     ) const
 {