diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-24 16:13:40 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-24 16:49:05 -0700 |
| commit | c093f4cce643e245ab2048e0782237744208eb9f (patch) | |
| tree | edcfb0fbdd57acc1df658d30fe4c87663d938044 /src/compat | |
| parent | 5cbd4c728046b4b12d289bf9b7edbc2c7b589fca (diff) | |
| download | tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.gz tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.bz2 tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.xz tmwa-c093f4cce643e245ab2048e0782237744208eb9f.zip | |
Header cleanup
Diffstat (limited to 'src/compat')
| -rw-r--r-- | src/compat/alg.cpp | 21 | ||||
| -rw-r--r-- | src/compat/alg.hpp | 41 | ||||
| -rw-r--r-- | src/compat/iter_test.cpp | 4 | ||||
| -rw-r--r-- | src/compat/memory.hpp | 1 |
4 files changed, 3 insertions, 64 deletions
diff --git a/src/compat/alg.cpp b/src/compat/alg.cpp deleted file mode 100644 index 8cfd00a..0000000 --- a/src/compat/alg.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "alg.hpp" -// alg.cpp - Silly math stuff. -// -// Copyright © 2012 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 "../poison.hpp" diff --git a/src/compat/alg.hpp b/src/compat/alg.hpp deleted file mode 100644 index 2587f9e..0000000 --- a/src/compat/alg.hpp +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef TMWA_COMPAT_ALG_HPP -#define TMWA_COMPAT_ALG_HPP -// alg.hpp - Silly math stuff. -// -// Copyright © 2012 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" - -# if 0 -# include <type_traits> - - -template<class A, class B> -typename std::common_type<A, B>::type min(A a, B b) -{ - return a < b ? a : b; -} - -template<class A, class B> -typename std::common_type<A, B>::type max(A a, B b) -{ - return b < a ? a : b; -} -# endif - -#endif // TMWA_COMPAT_ALG_HPP diff --git a/src/compat/iter_test.cpp b/src/compat/iter_test.cpp index 99b2e68..2c3cdc8 100644 --- a/src/compat/iter_test.cpp +++ b/src/compat/iter_test.cpp @@ -20,9 +20,9 @@ #include <gtest/gtest.h> -#include "../ints/udl.hpp" +#include <algorithm> -#include "../strings/xstring.hpp" +#include "../ints/udl.hpp" #include "../poison.hpp" diff --git a/src/compat/memory.hpp b/src/compat/memory.hpp index 8cafcb4..3a2af96 100644 --- a/src/compat/memory.hpp +++ b/src/compat/memory.hpp @@ -22,6 +22,7 @@ # include "fwd.hpp" # include <memory> +# include <type_traits> template<class T> |