Set fourth file version digit to signify rebuild.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / EndpointManager.h

diff --git a/saml/saml2/metadata/EndpointManager.h b/saml/saml2/metadata/EndpointManager.h
index b7495b1..47f60cc 100644 (file)
--- a/saml/saml2/metadata/EndpointManager.h
+++ b/saml/saml2/metadata/EndpointManager.h
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -25,6 +29,9 @@
 
 #include <saml/base.h>
 
+#include <vector>
+#include <xercesc/util/XMLString.hpp>
+
 namespace opensaml {
     namespace saml2md {
         
@@ -53,14 +60,14 @@ namespace opensaml {
              * Returns endpoint that supports a particular binding.
              * 
              * @param binding   binding to locate
-             * @return a supporting endpoint, favoring the default, or NULL
+             * @return a supporting endpoint, favoring the default, or nullptr
              */
             const _Tx* getByBinding(const XMLCh* binding) const {
                 for (typename std::vector<_Tx*>::const_iterator i = m_endpoints.begin(); i!=m_endpoints.end(); ++i) {
                     if (xercesc::XMLString::equals(binding,(*i)->getBinding()))
                         return *i;
                 }
-                return NULL;
+                return nullptr;
             }
         };
 
@@ -80,7 +87,7 @@ namespace opensaml {
              *
              * @param endpoints array of endpoints to manage
              */
-            IndexedEndpointManager(const typename std::vector<_Tx*>& endpoints) : EndpointManager<_Tx>(endpoints), m_default(NULL) {
+            IndexedEndpointManager(const typename std::vector<_Tx*>& endpoints) : EndpointManager<_Tx>(endpoints), m_default(nullptr) {
             }
             
             /**
@@ -95,14 +102,14 @@ namespace opensaml {
                     if ((*i)->isDefault())
                         return m_default=*i;
                 }
-                return (EndpointManager<_Tx>::m_endpoints.empty()) ? m_default=NULL : m_default=EndpointManager<_Tx>::m_endpoints.front();
+                return (EndpointManager<_Tx>::m_endpoints.empty()) ? m_default=nullptr : m_default=EndpointManager<_Tx>::m_endpoints.front();
             }
             
             /**
              * Returns indexed endpoint.
              * 
              * @param index index to locate
-             * @return matching endpoint, or NULL
+             * @return matching endpoint, or nullptr
              */
             const _Tx* getByIndex(unsigned short index) const {
                 for (typename std::vector<_Tx*>::const_iterator i = EndpointManager<_Tx>::m_endpoints.begin(); i!=EndpointManager<_Tx>::m_endpoints.end(); ++i) {
@@ -110,14 +117,14 @@ namespace opensaml {
                     if (comp.first && index == comp.second)
                         return *i;
                 }
-                return NULL;
+                return nullptr;
             }
             
             /**
              * Returns endpoint that supports a particular binding.
              * 
              * @param binding   binding to locate
-             * @return a supporting endpoint, favoring the default, or NULL
+             * @return a supporting endpoint, favoring the default, or nullptr
              */
             const _Tx* getByBinding(const XMLCh* binding) const {
                 if (getDefault() && xercesc::XMLString::equals(binding,m_default->getBinding()))