comparator: move pointer comparator code inline

CMakeLists.txt

@@ -397,7 +397,6 @@ list (
     typeidx.hpp
     types/bits.hpp
     types/comparator.hpp
-    types/comparator.ipp
     types.hpp
     types/string.cpp
     types/string.hpp

types/comparator.hpp

@@ -14,19 +14,38 @@
  * Copyright 2012-2017 Danny Robson <danny@nerdcruft.net>
  */
 
-#ifndef __UTIL_TYPES_COMPARATOR_HPP
+#ifndef UTIL_TYPES_COMPARATOR_HPP
-#define __UTIL_TYPES_COMPARATOR_HPP
+#define UTIL_TYPES_COMPARATOR_HPP
 
 #include <memory>
 
 #include "./iterator.hpp"
 
 namespace util::comparator {
+    ///////////////////////////////////////////////////////////////////////////
+    /// Compares standard types that can be reduced to pointers.
     template <typename T>
-    struct pointer_comparator {
+    struct pointer {
-        bool operator() (const std::unique_ptr<T> &lhs, const std::unique_ptr<T> &rhs);
+        constexpr
-        bool operator() (const T                  *lhs, const std::unique_ptr<T> &rhs);
+        bool
-        bool operator() (const std::unique_ptr<T> &lhs, const T                  *rhs);
+        operator() (const std::unique_ptr<T> &a, const std::unique_ptr<T> &b)
+        {
+            return a < b;
+        }
+
+        constexpr
+        bool
+        operator() (const T *a, const std::unique_ptr<T> &b)
+        {
+            return a < b.get ();
+        }
+
+        constexpr
+        bool
+        operator() (const std::unique_ptr<T> &a, const T *b)
+        {
+            return a.get () < b;
+        }
     };
 
 
@@ -55,5 +74,4 @@ namespace util::comparator {
     };
 }
 
-#include "./comparator.ipp"
 #endif

types/comparator.ipp

@@ -1,46 +0,0 @@
-/*
- * 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
- *
- *     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.
- *
- * Copyright 2012-2017 Danny Robson <danny@nerdcruft.net>
- */
-
-#ifdef __UTIL_TYPES_COMPARATOR_IPP
-#error "Double inclusion for util/types/comparator.ipp"
-#endif
-
-#define __UTIL_TYPES_COMPARATOR_IPP
-
-
-//-----------------------------------------------------------------------------
-namespace util::comparator {
-    template <typename T>
-    bool
-    pointer_comparator<T>::operator() (const std::unique_ptr<T> &lhs,
-                                       const std::unique_ptr<T> &rhs)
-        { return lhs < rhs; }
-
-
-    template <typename T>
-    bool
-    pointer_comparator<T>::operator() (const T                  *lhs,
-                                       const std::unique_ptr<T> &rhs)
-        { return lhs < rhs.get (); }
-
-
-    template <typename T>
-    bool
-    pointer_comparator<T>::operator() (const std::unique_ptr<T> &lhs,
-                                       const T                  *rhs)
-        { return lhs.get () < rhs; }
-}
-