Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / samltest / signature / SAMLSignatureTestBase.h

diff --git a/samltest/signature/SAMLSignatureTestBase.h b/samltest/signature/SAMLSignatureTestBase.h
index aa6c290..e20f296 100644 (file)
--- a/samltest/signature/SAMLSignatureTestBase.h
+++ b/samltest/signature/SAMLSignatureTestBase.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2007 Internet2
+ *  Copyright 2001-2010 Internet2
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,11 @@
 
 #include <sstream>
 #include <saml/signature/SignatureProfileValidator.h>
+#include <xmltooling/security/Credential.h>
 #include <xmltooling/security/CredentialCriteria.h>
 #include <xmltooling/security/CredentialResolver.h>
 #include <xmltooling/signature/KeyInfo.h>
+#include <xmltooling/signature/Signature.h>
 #include <xmltooling/signature/SignatureValidator.h>
 
 using namespace xmlsignature;
@@ -30,7 +32,7 @@ protected:
     CredentialResolver* m_resolver;
 public:
     void setUp() {
-        m_resolver=NULL;
+        m_resolver=nullptr;
         SAMLObjectBaseTestCase::setUp();
         string config = data_path + "FilesystemCredentialResolver.xml";
         ifstream in(config.c_str());