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

[shibboleth/cpp-opensaml.git] / saml / saml2 / profile / SAML2AssertionPolicy.h

diff --git a/saml/saml2/profile/SAML2AssertionPolicy.h b/saml/saml2/profile/SAML2AssertionPolicy.h
index 17edff4..72c2525 100644 (file)
--- a/saml/saml2/profile/SAML2AssertionPolicy.h
+++ b/saml/saml2/profile/SAML2AssertionPolicy.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2009 Internet2
+ *  Copyright 2009-2010 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,28 +50,23 @@ namespace opensaml {
              * @param validate          true iff XML parsing should be done with validation
              */
             SAML2AssertionPolicy(
-                const saml2md::MetadataProvider* metadataProvider=NULL,
-                const xmltooling::QName* role=NULL,
-                const xmltooling::TrustEngine* trustEngine=NULL,
+                const saml2md::MetadataProvider* metadataProvider=nullptr,
+                const xmltooling::QName* role=nullptr,
+                const xmltooling::TrustEngine* trustEngine=nullptr,
                 bool validate=true
-                ) : SecurityPolicy(metadataProvider, role, trustEngine, validate) {
-            }
+                );
 
-            virtual ~SAML2AssertionPolicy() {}
+            virtual ~SAML2AssertionPolicy();
 
             virtual void reset(bool messageOnly=false);
-            void _reset(bool messageOnly=false) {
-                m_confirmation = false;
-            }
+            void _reset(bool messageOnly=false);
 
             /**
              * Returns the subject confirmation that was successfully accepted by the policy.
              *
              * @return a successfully evaluated SubjectConfirmation
              */
-            const saml2::SubjectConfirmation* getSubjectConfirmation() const {
-                return m_confirmation;
-            }
+            const saml2::SubjectConfirmation* getSubjectConfirmation() const;
 
             /**
              * Sets the SubjectConfirmation that was successfully accepted by the policy.
@@ -81,9 +76,7 @@ namespace opensaml {
              *
              * @param confirmation the successfully evaluated SubjectConfirmation
              */
-            void setSubjectConfirmation(const saml2::SubjectConfirmation* confirmation) {
-                m_confirmation = confirmation;
-            }
+            void setSubjectConfirmation(const saml2::SubjectConfirmation* confirmation);
 
         private:
             const saml2::SubjectConfirmation* m_confirmation;