Fix header ranking

3 files changed, 4 insertions, 69 deletions

diff --git a/src/generic/fwd.hpp b/src/generic/fwd.hpp
index 9c389b1..2517d62 100644
--- a/src/generic/fwd.hpp
+++ b/src/generic/fwd.hpp
@@ -20,6 +20,10 @@
 
 #include "../sanity.hpp"
 
+#include "../strings/fwd.hpp" // rank 1
+#include "../compat/fwd.hpp" // rank 2
+// generic/fwd.hpp is rank 3
+
 
 namespace tmwa
 {
diff --git a/src/generic/md5.hpp b/src/generic/md5.hpp
index 50bc987..2f07789 100644
--- a/src/generic/md5.hpp
+++ b/src/generic/md5.hpp
@@ -24,7 +24,6 @@
 
 #include <array>
 
-#include "../strings/fwd.hpp"
 #include "../strings/vstring.hpp"
 
 
diff --git a/src/generic/operators.hpp b/src/generic/operators.hpp
deleted file mode 100644
index bb05765..0000000
--- a/src/generic/operators.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-//    operators.hpp - ADL helper for value wrappers.
-//
-//    Copyright © 2013 Ben Longbons <b.r.longbons@gmail.com>
-//
-//    This file is part of The Mana World (Athena server)
-//
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "fwd.hpp"
-
-
-namespace tmwa
-{
-namespace _operators
-{
-    class Comparable {};
-
-    template<class T>
-    bool operator == (T l, T r)
-    {
-        return l.value == r.value;
-    }
-
-    template<class T>
-    bool operator != (T l, T r)
-    {
-        return l.value != r.value;
-    }
-
-    template<class T>
-    bool operator < (T l, T r)
-    {
-        return l.value < r.value;
-    }
-
-    template<class T>
-    bool operator <= (T l, T r)
-    {
-        return l.value <= r.value;
-    }
-
-    template<class T>
-    bool operator > (T l, T r)
-    {
-        return l.value > r.value;
-    }
-
-    template<class T>
-    bool operator >= (T l, T r)
-    {
-        return l.value >= r.value;
-    }
-}
-
-using _operators::Comparable;
-} // namespace tmwa