Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / Credential.h

diff --git a/xmltooling/security/Credential.h b/xmltooling/security/Credential.h
index ecd575a..0d2362f 100644 (file)
--- a/xmltooling/security/Credential.h
+++ b/xmltooling/security/Credential.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.
@@ -24,11 +24,12 @@
 #define __xmltooling_cred_h__
 
 #include <xmltooling/base.h>
-#include <xsec/enc/XSECCryptoKey.hpp>
 
 #include <set>
 #include <string>
 
+class XSECCryptoKey;
+
 namespace xmlsignature {
     class XMLTOOL_API KeyInfo;
 };
@@ -48,10 +49,10 @@ namespace xmltooling {
     {
         MAKE_NONCOPYABLE(Credential);
     protected:
-        Credential() {}
+        Credential();
 
     public:
-        virtual ~Credential() {}
+        virtual ~Credential();
 
         /**
          * Bitmask constants for limiting resolution process inside a CredentialResolver.
@@ -89,7 +90,7 @@ namespace xmltooling {
         /**
          * Returns an algorithm identifier for the Credential.
          *
-         * @return  the Credential algorithm, or NULL if indeterminate
+         * @return  the Credential algorithm, or nullptr if indeterminate
          */
         virtual const char* getAlgorithm() const=0;
 
@@ -139,9 +140,7 @@ namespace xmltooling {
          *
          * @return resolution context of the credential
          */
-        virtual const CredentialContext* getCredentalContext() const {
-            return NULL;
-        }
+        virtual const CredentialContext* getCredentalContext() const;
     };
 };