Convert from NULL macro to nullptr.

[shibboleth/cpp-xmltooling.git] / xmltooling / security / impl / StaticPKIXTrustEngine.cpp

diff --git a/xmltooling/security/impl/StaticPKIXTrustEngine.cpp b/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
index f2432bd..8a94206 100644 (file)
--- a/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
+++ b/xmltooling/security/impl/StaticPKIXTrustEngine.cpp
@@ -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.
@@ -17,7 +17,7 @@
 /**
  * PKIXTrustEngine.cpp
  * 
- * Shibboleth-specific PKIX-validation TrustEngine
+ * Shibboleth-specific PKIX-validation TrustEngine.
  */
 
 #include "internal.h"
@@ -48,14 +48,14 @@ namespace xmltooling {
     class XMLTOOL_DLLLOCAL StaticPKIXTrustEngine : public AbstractPKIXTrustEngine
     {
     public:
-        StaticPKIXTrustEngine(const DOMElement* e=NULL);
+        StaticPKIXTrustEngine(const DOMElement* e=nullptr);
 
         virtual ~StaticPKIXTrustEngine() {
             delete m_credResolver;
         }
         
         AbstractPKIXTrustEngine::PKIXValidationInfoIterator* getPKIXValidationInfoIterator(
-            const CredentialResolver& pkixSource, CredentialCriteria* criteria=NULL
+            const CredentialResolver& pkixSource, CredentialCriteria* criteria=nullptr
             ) const;
 
         const KeyInfoResolver* getKeyInfoResolver() const {
@@ -126,19 +126,19 @@ namespace xmltooling {
     };
 };
 
-StaticPKIXTrustEngine::StaticPKIXTrustEngine(const DOMElement* e) : AbstractPKIXTrustEngine(e), m_depth(1), m_credResolver(NULL)
+StaticPKIXTrustEngine::StaticPKIXTrustEngine(const DOMElement* e) : AbstractPKIXTrustEngine(e), m_depth(1), m_credResolver(nullptr)
 {
-    const XMLCh* depth = e ? e->getAttributeNS(NULL, verifyDepth) : NULL;
+    const XMLCh* depth = e ? e->getAttributeNS(nullptr, verifyDepth) : nullptr;
     if (depth && *depth)
         m_depth = XMLString::parseInt(depth);
 
-    if (e && e->hasAttributeNS(NULL,certificate)) {
+    if (e && e->hasAttributeNS(nullptr,certificate)) {
         // Simple File resolver config rooted here.
         m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER,e);
     }
     else {
-        e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;
-        auto_ptr_char t(e ? e->getAttributeNS(NULL,type) : NULL);
+        e = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : nullptr;
+        auto_ptr_char t(e ? e->getAttributeNS(nullptr,type) : nullptr);
         if (t.get()) {
             m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.get(),e);
         }