X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Futil%2FPredicates.h;h=b63c4c91559069c1b4c7a600c112bf5a82cd2181;hb=81b488b2790e7bdeb2f43560b1d4a7d22c3dfdf5;hp=b822862af6c154028e2bc4ccd94dd6ce29e99129;hpb=2e971d469fdec96f67e0ef2da7e68e011242822a;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/util/Predicates.h b/xmltooling/util/Predicates.h
index b822862..b63c4c9 100644
--- a/xmltooling/util/Predicates.h
+++ b/xmltooling/util/Predicates.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.
+ *
+ * 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
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 /**
@@ -76,7 +80,7 @@ namespace xmltooling {
          * @param xmlObject the object to examine
          */
         bool operator()(const XMLObject* xmlObject) const {
-            const QName* xsitype = xmlObject ? xmlObject->getSchemaType() : NULL;
+            const QName* xsitype = xmlObject ? xmlObject->getSchemaType() : nullptr;
             return xsitype ? (*xsitype == m_q) : false;
         }
         
@@ -89,12 +93,12 @@ namespace xmltooling {
      *
      * @param c read-only container of pointer-based objects
      * @param p a predicate function
-     * @return  the first object in the container matching the predicate, or NULL
+     * @return  the first object in the container matching the predicate, or nullptr
      */
     template<typename Container, typename Predicate>
     typename Container::value_type find_if(const Container& c, const Predicate& p) {
         typename Container::const_iterator i = std::find_if(c.begin(), c.end(), p);
-        return (i!=c.end()) ? *i : NULL;
+        return (i!=c.end()) ? *i : nullptr;
     }
 
     /**
@@ -102,12 +106,12 @@ namespace xmltooling {
      *
      * @param c read-only container of pointer-based objects
      * @param p a predicate function
-     * @return  the first object in the container matching the predicate, or NULL
+     * @return  the first object in the container matching the predicate, or nullptr
      */
     template<typename Container, typename Predicate>
     typename Container::value_type find_if(Container& c, const Predicate& p) {
         typename Container::iterator i = std::find_if(c.begin(), c.end(), p);
-        return (i!=c.end()) ? *i : NULL;
+        return (i!=c.end()) ? *i : nullptr;
     }
 
 };