From: clinton <clinton@unknownlamer.org>
Date: Thu, 13 Nov 2008 11:28:04 +0000 (+0000)
Subject: Cease including Bot.H in Utils.H
X-Git-Tag: release-2.3.1~44
X-Git-Url: https://git.hcoop.net/clinton/bobotpp.git/commitdiff_plain/2169cb1011b535e2ad03995d332c8507808f25e6

Cease including Bot.H in Utils.H

And miscellaneous cleanup as a result. Owing to Bot.H being included
by Utils.H no header mentioned in Bot.H could include Utils.H (not a
problem except in an upcoming revision of BotInterp.H)
---

diff --git a/source/Person.C b/source/Person.C
index a28523e..26b4cf9 100644
--- a/source/Person.C
+++ b/source/Person.C
@@ -17,6 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 // 02110-1301, USA.
 
+#include "Bot.H"
 #include "Utils.H"
 #include "Person.H"
 
diff --git a/source/ServerQueue.C b/source/ServerQueue.C
index e927c1c..0dc5f74 100644
--- a/source/ServerQueue.C
+++ b/source/ServerQueue.C
@@ -22,6 +22,9 @@
 #endif
 
 #include <limits>
+
+#include "Interp.H"
+#include "BotInterp.H"
 #include "ServerQueue.H"
 #include "Utils.H"
 
diff --git a/source/Utils.C b/source/Utils.C
index 3db5182..7105380 100644
--- a/source/Utils.C
+++ b/source/Utils.C
@@ -25,6 +25,7 @@
 #include <string>
 #include <sstream>
 
+#include "Bot.H"
 #include "Utils.H"
 #include "StringTokenizer.H"
 
diff --git a/source/Utils.H b/source/Utils.H
index ff1f6d7..a68eabe 100644
--- a/source/Utils.H
+++ b/source/Utils.H
@@ -27,7 +27,7 @@
 #include <ctime>
 #include <string>
 
-#include "Bot.H"
+class Bot;
 
 #ifdef USESCRIPTS
 #include <libguile.h>