SSPCPP-616 - clean up concatenated string literals

[shibboleth/cpp-xmltooling.git] / xmltooling / util / Predicates.h

diff --git a/xmltooling/util/Predicates.h b/xmltooling/util/Predicates.h
index 2453a62..dfe4763 100644 (file)
--- 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.
  */
 
 /**
@@ -23,6 +27,7 @@
 #ifndef __xmltooling_predicates_h__
 #define __xmltooling_predicates_h__
 
+#include <xmltooling/QName.h>
 #include <xmltooling/XMLObject.h>
 
 #include <functional>
@@ -48,7 +53,7 @@ namespace xmltooling {
          * 
          * @param xmlObject the object to examine
          */
-        bool operator()(const XMLObject* xmlObject) {
+        bool operator()(const XMLObject* xmlObject) const {
             return xmlObject ? (xmlObject->getElementQName() == m_q) : false;
         }
         
@@ -75,15 +80,41 @@ namespace xmltooling {
          * 
          * @param xmlObject the object to examine
          */
-        bool operator()(const XMLObject* xmlObject) {
-            const QName* xsitype = xmlObject ? xmlObject->getSchemaType() : NULL;
+        bool operator()(const XMLObject* xmlObject) const {
+            const QName* xsitype = xmlObject ? xmlObject->getSchemaType() : nullptr;
             return xsitype ? (*xsitype == m_q) : false;
         }
         
     private:
         const QName& m_q;
     };
-        
+
+    /**
+     * Template algorithm returns first pointer element from a container that matches a predicate.
+     *
+     * @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 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 : nullptr;
+    }
+
+    /**
+     * Template algorithm returns first pointer element from a container that matches a predicate.
+     *
+     * @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 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 : nullptr;
+    }
+
 };
 
 #endif /* __xmltooling_predicates_h__ */