Fix pch header inclusions and missing headers for no-pch building

20 files changed, 30 insertions, 21 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 985789b..d8871ca 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiResult.h"
 #include <cgicc/Cgicc.h>
diff --git a/project2/cgi/cgiCommon.cpp b/project2/cgi/cgiCommon.cpp
index ea4694e..92725c1 100644
--- a/project2/cgi/cgiCommon.cpp
+++ b/project2/cgi/cgiCommon.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiCommon.h"
 #include "logger.h"
 #include <glibmm/exception.h>
diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp
index 8e265a8..176441e 100644
--- a/project2/cgi/cgiContentNegotiate.cpp
+++ b/project2/cgi/cgiContentNegotiate.cpp
@@ -1,6 +1,8 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include <boost/tokenizer.hpp>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
 
 class ContentNegotiateLoader : public PresenterLoader {
 	public:
diff --git a/project2/cgi/cgiEnvironment.cpp b/project2/cgi/cgiEnvironment.cpp
index 048f7d7..618548c 100644
--- a/project2/cgi/cgiEnvironment.cpp
+++ b/project2/cgi/cgiEnvironment.cpp
@@ -1,5 +1,6 @@
-#include <pch.hpp>
-#include <boost/version.hpp>
+#include "pch.hpp"
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include "cgiEnvironment.h"
 #include "appEngine.h"
diff --git a/project2/cgi/cgiHttpHeader.cpp b/project2/cgi/cgiHttpHeader.cpp
index 28dcec9..6b7a736 100644
--- a/project2/cgi/cgiHttpHeader.cpp
+++ b/project2/cgi/cgiHttpHeader.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiHttpHeader.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp
index 15a8856..d094598 100644
--- a/project2/cgi/cgiProgRouter.cpp
+++ b/project2/cgi/cgiProgRouter.cpp
@@ -1,7 +1,11 @@
-#include <pch.hpp>
+#include "pch.hpp"
+#include <boost/foreach.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include "cgiEnvironment.h"
+#include "presenter.h"
 #include "safeMapFind.h"
+#include "scriptStorage.h"
+#include "rowSet.h"
 #include "exceptions.h"
 
 typedef std::map<std::string, std::string> VarMap;
diff --git a/project2/cgi/cgiRequestID.cpp b/project2/cgi/cgiRequestID.cpp
index 6f4d01e..1d674f8 100644
--- a/project2/cgi/cgiRequestID.cpp
+++ b/project2/cgi/cgiRequestID.cpp
@@ -1,5 +1,6 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <variables.h>
+#include "cgiEnvironment.h"
 #include <scriptLoader.h>
 #include <scriptStorage.h>
 #include <appEngine.h>
diff --git a/project2/cgi/cgiResultStatic.cpp b/project2/cgi/cgiResultStatic.cpp
index b5fecd7..5d8e442 100644
--- a/project2/cgi/cgiResultStatic.cpp
+++ b/project2/cgi/cgiResultStatic.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <time.h>
 #include "cgiResult.h"
 
diff --git a/project2/cgi/cgiResultWritable.cpp b/project2/cgi/cgiResultWritable.cpp
index ea17d3b..981f70c 100644
--- a/project2/cgi/cgiResultWritable.cpp
+++ b/project2/cgi/cgiResultWritable.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiResult.h"
 
 class WritableToCgiResult : public TransformImpl<WritableContent, CgiResult> {
diff --git a/project2/cgi/cgiStageCacheHit.cpp b/project2/cgi/cgiStageCacheHit.cpp
index d398e8f..5d094ce 100644
--- a/project2/cgi/cgiStageCacheHit.cpp
+++ b/project2/cgi/cgiStageCacheHit.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageCustomError.cpp b/project2/cgi/cgiStageCustomError.cpp
index 56739fd..1e10c71 100644
--- a/project2/cgi/cgiStageCustomError.cpp
+++ b/project2/cgi/cgiStageCustomError.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageCustomNotFound.cpp b/project2/cgi/cgiStageCustomNotFound.cpp
index 872da77..81394be 100644
--- a/project2/cgi/cgiStageCustomNotFound.cpp
+++ b/project2/cgi/cgiStageCustomNotFound.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index b8f0b4b..9589c14 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiHttpHeader.h"
 #include "logger.h"
diff --git a/project2/cgi/cgiStageDefaultNotFound.cpp b/project2/cgi/cgiStageDefaultNotFound.cpp
index 5b68bc6..15e0af8 100644
--- a/project2/cgi/cgiStageDefaultNotFound.cpp
+++ b/project2/cgi/cgiStageDefaultNotFound.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageFail.cpp b/project2/cgi/cgiStageFail.cpp
index 019ab8e..b75c183 100644
--- a/project2/cgi/cgiStageFail.cpp
+++ b/project2/cgi/cgiStageFail.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <boost/lexical_cast.hpp>
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
diff --git a/project2/cgi/cgiStageInitial.cpp b/project2/cgi/cgiStageInitial.cpp
index 1fe4820..03a4bcd 100644
--- a/project2/cgi/cgiStageInitial.cpp
+++ b/project2/cgi/cgiStageInitial.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "exceptions.h"
diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp
index 90299fe..fb2f3d8 100644
--- a/project2/cgi/cgiStagePresent.cpp
+++ b/project2/cgi/cgiStagePresent.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageRedirect.cpp b/project2/cgi/cgiStageRedirect.cpp
index 4a4cd02..c7f8a8b 100644
--- a/project2/cgi/cgiStageRedirect.cpp
+++ b/project2/cgi/cgiStageRedirect.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiStageRequest.cpp b/project2/cgi/cgiStageRequest.cpp
index 8fa06bf..8266072 100644
--- a/project2/cgi/cgiStageRequest.cpp
+++ b/project2/cgi/cgiStageRequest.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cgiAppEngine.h"
 #include "cgiEnvironment.h"
 #include "cgiHttpHeader.h"
diff --git a/project2/cgi/cgiUriParam.cpp b/project2/cgi/cgiUriParam.cpp
index 04a2c36..fe74038 100644
--- a/project2/cgi/cgiUriParam.cpp
+++ b/project2/cgi/cgiUriParam.cpp
@@ -1,4 +1,5 @@
-#include <pch.hpp>
+#include "pch.hpp"
+#include "cgiEnvironment.h"
 #include <variables.h>
 #include <scriptLoader.h>
 #include <scriptStorage.h>