From c093f4cce643e245ab2048e0782237744208eb9f Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 24 Apr 2014 16:13:40 -0700 Subject: Header cleanup --- src/strings/all.hpp | 1 + src/strings/astring.cpp | 7 ++++++- src/strings/astring.hpp | 3 --- src/strings/base.hpp | 2 -- src/strings/base.tcc | 2 ++ src/strings/base_test.cpp | 1 + src/strings/literal.hpp | 2 -- src/strings/mstring.hpp | 2 -- src/strings/pair.hpp | 4 ---- src/strings/rstring.cpp | 6 +++++- src/strings/rstring.hpp | 1 - src/strings/sstring.cpp | 3 +++ src/strings/strings2_test.cpp | 4 ++-- src/strings/strings_test.cpp | 3 ++- src/strings/tstring.cpp | 3 +++ src/strings/vstring.tcc | 4 ++-- src/strings/xstring.cpp | 7 +++++++ src/strings/xstring.hpp | 1 - src/strings/zstring.cpp | 8 +++++++- src/strings/zstring.hpp | 3 --- src/strings/zstring.tcc | 2 -- 21 files changed, 41 insertions(+), 28 deletions(-) (limited to 'src/strings') diff --git a/src/strings/all.hpp b/src/strings/all.hpp index c87a403..6b67bee 100644 --- a/src/strings/all.hpp +++ b/src/strings/all.hpp @@ -29,6 +29,7 @@ # include "sstring.hpp" # include "zstring.hpp" # include "xstring.hpp" +# include "literal.hpp" # include "vstring.hpp" #endif // TMWA_STRINGS_ALL_HPP diff --git a/src/strings/astring.cpp b/src/strings/astring.cpp index 61c65b2..15d172b 100644 --- a/src/strings/astring.cpp +++ b/src/strings/astring.cpp @@ -18,15 +18,20 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include +#include #include +#include + #include "mstring.hpp" #include "tstring.hpp" #include "sstring.hpp" #include "zstring.hpp" #include "xstring.hpp" -#include "vstring.hpp" +#include "literal.hpp" +// doing sneaky tricks here //#include "../poison.hpp" namespace strings diff --git a/src/strings/astring.hpp b/src/strings/astring.hpp index 8558a98..e936c4c 100644 --- a/src/strings/astring.hpp +++ b/src/strings/astring.hpp @@ -21,9 +21,6 @@ # include "fwd.hpp" -# include -# include - # include "base.hpp" # include "rstring.hpp" diff --git a/src/strings/base.hpp b/src/strings/base.hpp index ee7480b..b1aff34 100644 --- a/src/strings/base.hpp +++ b/src/strings/base.hpp @@ -19,8 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" - # include "fwd.hpp" # include "pair.hpp" diff --git a/src/strings/base.tcc b/src/strings/base.tcc index a5a57d0..8b7982b 100644 --- a/src/strings/base.tcc +++ b/src/strings/base.tcc @@ -17,6 +17,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include #include "pair.hpp" diff --git a/src/strings/base_test.cpp b/src/strings/base_test.cpp index 6b3ba83..c630b5c 100644 --- a/src/strings/base_test.cpp +++ b/src/strings/base_test.cpp @@ -23,6 +23,7 @@ #include "vstring.hpp" #include "xstring.hpp" #include "rstring.hpp" +#include "literal.hpp" #include "../poison.hpp" diff --git a/src/strings/literal.hpp b/src/strings/literal.hpp index a3ebecd..6d84ebd 100644 --- a/src/strings/literal.hpp +++ b/src/strings/literal.hpp @@ -21,8 +21,6 @@ # include "fwd.hpp" -# include - # include "base.hpp" namespace strings diff --git a/src/strings/mstring.hpp b/src/strings/mstring.hpp index 2da6a78..47becc4 100644 --- a/src/strings/mstring.hpp +++ b/src/strings/mstring.hpp @@ -23,8 +23,6 @@ # include -# include "base.hpp" - namespace strings { /// An owning string that is still expected to change. diff --git a/src/strings/pair.hpp b/src/strings/pair.hpp index 24537de..cd59537 100644 --- a/src/strings/pair.hpp +++ b/src/strings/pair.hpp @@ -19,10 +19,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "../sanity.hpp" - -# include - # include "fwd.hpp" namespace strings diff --git a/src/strings/rstring.cpp b/src/strings/rstring.cpp index 671e7b0..6ffe79c 100644 --- a/src/strings/rstring.cpp +++ b/src/strings/rstring.cpp @@ -18,13 +18,17 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include + #include "mstring.hpp" +#include "astring.hpp" #include "tstring.hpp" #include "sstring.hpp" #include "zstring.hpp" #include "xstring.hpp" -#include "vstring.hpp" +#include "literal.hpp" +// doing sneaky tricks here //#include "../poison.hpp" namespace strings diff --git a/src/strings/rstring.hpp b/src/strings/rstring.hpp index 1de3e87..ae8b374 100644 --- a/src/strings/rstring.hpp +++ b/src/strings/rstring.hpp @@ -22,7 +22,6 @@ # include "fwd.hpp" # include -# include # include "base.hpp" diff --git a/src/strings/sstring.cpp b/src/strings/sstring.cpp index 8de8655..35885e8 100644 --- a/src/strings/sstring.cpp +++ b/src/strings/sstring.cpp @@ -18,9 +18,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "rstring.hpp" +#include "astring.hpp" #include "tstring.hpp" #include "zstring.hpp" #include "xstring.hpp" +#include "literal.hpp" #include "../poison.hpp" diff --git a/src/strings/strings2_test.cpp b/src/strings/strings2_test.cpp index 8c4a343..8a7ee66 100644 --- a/src/strings/strings2_test.cpp +++ b/src/strings/strings2_test.cpp @@ -1,4 +1,3 @@ -#include "all.hpp" // strings2_test.cpp - Testsuite part 2 for strings. // // Copyright © 2013 Ben Longbons @@ -18,9 +17,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . - #include +#include "all.hpp" + #include "../poison.hpp" TEST(StringTests, traits2) diff --git a/src/strings/strings_test.cpp b/src/strings/strings_test.cpp index 3abb5e1..b76bde5 100644 --- a/src/strings/strings_test.cpp +++ b/src/strings/strings_test.cpp @@ -1,4 +1,3 @@ -#include "all.hpp" // strings_test.cpp - Testsuite part 1 for strings. // // Copyright © 2013 Ben Longbons @@ -22,6 +21,8 @@ #include +#include "all.hpp" + #include "../poison.hpp" template diff --git a/src/strings/tstring.cpp b/src/strings/tstring.cpp index 27e8052..77d4b40 100644 --- a/src/strings/tstring.cpp +++ b/src/strings/tstring.cpp @@ -18,9 +18,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "rstring.hpp" +#include "astring.hpp" #include "sstring.hpp" #include "zstring.hpp" #include "xstring.hpp" +#include "literal.hpp" #include "../poison.hpp" diff --git a/src/strings/vstring.tcc b/src/strings/vstring.tcc index bb134b3..577261a 100644 --- a/src/strings/vstring.tcc +++ b/src/strings/vstring.tcc @@ -18,16 +18,16 @@ // along with this program. If not, see . #include +#include #include -#include "../compat/cast.hpp" - #include "rstring.hpp" #include "astring.hpp" #include "tstring.hpp" #include "sstring.hpp" #include "zstring.hpp" #include "xstring.hpp" +#include "literal.hpp" namespace strings { diff --git a/src/strings/xstring.cpp b/src/strings/xstring.cpp index 5312445..2f97c01 100644 --- a/src/strings/xstring.cpp +++ b/src/strings/xstring.cpp @@ -18,6 +18,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +#include "rstring.hpp" +#include "astring.hpp" +#include "tstring.hpp" +#include "sstring.hpp" +#include "zstring.hpp" +#include "literal.hpp" + #include "../poison.hpp" namespace strings diff --git a/src/strings/xstring.hpp b/src/strings/xstring.hpp index 96929c7..91371c8 100644 --- a/src/strings/xstring.hpp +++ b/src/strings/xstring.hpp @@ -22,7 +22,6 @@ # include "fwd.hpp" # include "base.hpp" -# include "literal.hpp" namespace strings { diff --git a/src/strings/zstring.cpp b/src/strings/zstring.cpp index 323ba5f..dd17e66 100644 --- a/src/strings/zstring.cpp +++ b/src/strings/zstring.cpp @@ -18,7 +18,13 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "xstring.hpp" +#include +#include + +#include "rstring.hpp" +#include "astring.hpp" +#include "tstring.hpp" +#include "literal.hpp" #include "../poison.hpp" diff --git a/src/strings/zstring.hpp b/src/strings/zstring.hpp index 3b651b9..e4cd1fd 100644 --- a/src/strings/zstring.hpp +++ b/src/strings/zstring.hpp @@ -21,10 +21,7 @@ # include "fwd.hpp" -# include - # include "base.hpp" -# include "literal.hpp" namespace strings { diff --git a/src/strings/zstring.tcc b/src/strings/zstring.tcc index 3ff7374..eb55f5a 100644 --- a/src/strings/zstring.tcc +++ b/src/strings/zstring.tcc @@ -17,8 +17,6 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include - #include "vstring.hpp" namespace strings -- cgit v1.2.3-60-g2f50