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

47 files changed, 58 insertions, 46 deletions

diff --git a/project2/common/appEngine.cpp b/project2/common/appEngine.cpp
index c6d3e92..e1b938b 100644
--- a/project2/common/appEngine.cpp
+++ b/project2/common/appEngine.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "appEngine.h"
 #include "logger.h"
 #include "presenter.h"
diff --git a/project2/common/cache.cpp b/project2/common/cache.cpp
index 9be5845..eb342c5 100644
--- a/project2/common/cache.cpp
+++ b/project2/common/cache.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "cache.h"
 #include "rowSet.h"
 #include "rowProcessor.h"
diff --git a/project2/common/check.cpp b/project2/common/check.cpp
index c284c8d..339a413 100644
--- a/project2/common/check.cpp
+++ b/project2/common/check.cpp
@@ -1,6 +1,7 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "check.h"
 #include "scriptLoader.h"
+#include "scriptStorage.h"
 
 DECLARE_LOADER("check", Check);
 StaticMessageException(NoTestsToPerform, "No tests to perform");
diff --git a/project2/common/checkHost.cpp b/project2/common/checkHost.cpp
index 49533a9..2200c75 100644
--- a/project2/common/checkHost.cpp
+++ b/project2/common/checkHost.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "checkHost.h"
 #include "appEngine.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/columns.cpp b/project2/common/columns.cpp
index 268a59d..c3f8e7e 100644
--- a/project2/common/columns.cpp
+++ b/project2/common/columns.cpp
@@ -1,5 +1,6 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "columns.h"
+#include "scripts.h"
 
 Column::Column(unsigned int i, ScriptNodePtr p) :
 	idx(i),
diff --git a/project2/common/commonObjects.cpp b/project2/common/commonObjects.cpp
index 9b45baa..ca5cec3 100644
--- a/project2/common/commonObjects.cpp
+++ b/project2/common/commonObjects.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "commonObjects.h"
 #include "safeMapFind.h"
 #include "appEngine.h"
diff --git a/project2/common/dataSource.cpp b/project2/common/dataSource.cpp
index cd03300..d00ebf1 100644
--- a/project2/common/dataSource.cpp
+++ b/project2/common/dataSource.cpp
@@ -1,5 +1,6 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "dataSource.h"
+#include "scripts.h"
 
 DataSource::DataSource(ScriptNodePtr p) :
 	SourceObject(p)
diff --git a/project2/common/definedColumns.cpp b/project2/common/definedColumns.cpp
index cc88939..a0c86d2 100644
--- a/project2/common/definedColumns.cpp
+++ b/project2/common/definedColumns.cpp
@@ -1,6 +1,8 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "definedColumns.h"
+#include "scripts.h"
 #include <boost/function.hpp>
+#include <boost/foreach.hpp>
 
 DefinedColumns::DefinedColumns(ScriptNodePtr p, const Glib::ustring & colPath, const ColCreator & func)
 {
diff --git a/project2/common/environment.cpp b/project2/common/environment.cpp
index b13a1c0..57665f0 100644
--- a/project2/common/environment.cpp
+++ b/project2/common/environment.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "environment.h"
 #include "optionsSource.h"
 #include "logger.h"
diff --git a/project2/common/exceptions.cpp b/project2/common/exceptions.cpp
index 4f061ab..b6dd5ba 100644
--- a/project2/common/exceptions.cpp
+++ b/project2/common/exceptions.cpp
@@ -1,7 +1,9 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "exceptions.h"
+#include "logger.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <error.h>
 
 numeric_error::numeric_error(int e) :
 	err(e),
diff --git a/project2/common/fileStrmVarWriter.cpp b/project2/common/fileStrmVarWriter.cpp
index caaf908..f3cf666 100644
--- a/project2/common/fileStrmVarWriter.cpp
+++ b/project2/common/fileStrmVarWriter.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "fileStrmVarWriter.h"
 #include "rowSet.h"
 #include "scriptLoader.h"
diff --git a/project2/common/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp
index f880944..37e478c 100644
--- a/project2/common/iHaveParameters.cpp
+++ b/project2/common/iHaveParameters.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "iHaveParameters.h"
 #include "exceptions.h"
 #include "safeMapFind.h"
diff --git a/project2/common/iHaveSubTasks.cpp b/project2/common/iHaveSubTasks.cpp
index 78868aa..5c9d801 100644
--- a/project2/common/iHaveSubTasks.cpp
+++ b/project2/common/iHaveSubTasks.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "iHaveSubTasks.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/if.cpp b/project2/common/if.cpp
index c7f790e..cc2f216 100644
--- a/project2/common/if.cpp
+++ b/project2/common/if.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "if.h"
 #include "logger.h"
 #include "scriptLoader.h"
diff --git a/project2/common/iterate.cpp b/project2/common/iterate.cpp
index 037261d..20694a3 100644
--- a/project2/common/iterate.cpp
+++ b/project2/common/iterate.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "iterate.h"
 #include "logger.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/library.cpp b/project2/common/library.cpp
index b53a6b0..911d428 100644
--- a/project2/common/library.cpp
+++ b/project2/common/library.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <dlfcn.h>
 #include "scriptStorage.h"
 #include "exceptions.h"
diff --git a/project2/common/logger.cpp b/project2/common/logger.cpp
index 8140155..7f8981f 100644
--- a/project2/common/logger.cpp
+++ b/project2/common/logger.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #define SYSLOG_NAMES 1 // Enables the definition of names in syslog.h
 
 #include "logger.h"
diff --git a/project2/common/logger.h b/project2/common/logger.h
index c333123..5a4809d 100644
--- a/project2/common/logger.h
+++ b/project2/common/logger.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <stdarg.h>
+#include <stdlib.h>
 #include <syslog.h> // Pulled in for easy client lookups of LOG_* priorties
 #include <boost/intrusive_ptr.hpp>
 #include <boost/format.hpp>
diff --git a/project2/common/memoryCache.cpp b/project2/common/memoryCache.cpp
index 8c85127..4e5f276 100644
--- a/project2/common/memoryCache.cpp
+++ b/project2/common/memoryCache.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "logger.h"
 #include "cache.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/noOutputExecute.cpp b/project2/common/noOutputExecute.cpp
index 02c8f71..52a4982 100644
--- a/project2/common/noOutputExecute.cpp
+++ b/project2/common/noOutputExecute.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "noOutputExecute.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/options.cpp b/project2/common/options.cpp
index 60fd7cd..13e189b 100644
--- a/project2/common/options.cpp
+++ b/project2/common/options.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "options.h"
 #include "environment.h"
 #include <boost/foreach.hpp>
diff --git a/project2/common/presenter.cpp b/project2/common/presenter.cpp
index 1e5bbf2..e273471 100644
--- a/project2/common/presenter.cpp
+++ b/project2/common/presenter.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "presenter.h"
 #include "dataSource.h"
 #include "appEngine.h"
diff --git a/project2/common/rowProcessor.cpp b/project2/common/rowProcessor.cpp
index 4e3bf1d..aa2a56a 100644
--- a/project2/common/rowProcessor.cpp
+++ b/project2/common/rowProcessor.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "rowProcessor.h"
 #include "logger.h"
 #include "commonObjects.h"
diff --git a/project2/common/rowSet.cpp b/project2/common/rowSet.cpp
index 0378b51..99aed50 100644
--- a/project2/common/rowSet.cpp
+++ b/project2/common/rowSet.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "rowSet.h"
 #include "commonObjects.h"
 #include "scopeObject.h"
diff --git a/project2/common/rowView.cpp b/project2/common/rowView.cpp
index c0e5cae..e8ad53f 100644
--- a/project2/common/rowView.cpp
+++ b/project2/common/rowView.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "rowView.h"
 #include "presenter.h"
 #include "scopeObject.h"
diff --git a/project2/common/scopeObject.cpp b/project2/common/scopeObject.cpp
index e28e642..b51287c 100644
--- a/project2/common/scopeObject.cpp
+++ b/project2/common/scopeObject.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "scopeObject.h"
 #include "logger.h"
 
diff --git a/project2/common/scriptLoader.cpp b/project2/common/scriptLoader.cpp
index 1f5243e..e4f31da 100644
--- a/project2/common/scriptLoader.cpp
+++ b/project2/common/scriptLoader.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "scopeObject.h"
 #include "scriptLoader.h"
 #include "scriptStorage.h"
diff --git a/project2/common/session.cpp b/project2/common/session.cpp
index 66d93a5..f956d03 100644
--- a/project2/common/session.cpp
+++ b/project2/common/session.cpp
@@ -1,6 +1,7 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "session.h"
 #include "safeMapFind.h"
+#include <boost/foreach.hpp>
 
 Session::Session()
 {
diff --git a/project2/common/sessionClearTask.cpp b/project2/common/sessionClearTask.cpp
index b3b1000..7430d37 100644
--- a/project2/common/sessionClearTask.cpp
+++ b/project2/common/sessionClearTask.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <boost/foreach.hpp>
 #include "scriptLoader.h"
 #include "sessionClearTask.h"
diff --git a/project2/common/sessionContainer.cpp b/project2/common/sessionContainer.cpp
index ed36fb3..1366fc7 100644
--- a/project2/common/sessionContainer.cpp
+++ b/project2/common/sessionContainer.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "sessionContainer.h"
 #include "environment.h"
 
diff --git a/project2/common/sessionSetTask.cpp b/project2/common/sessionSetTask.cpp
index aca5b26..7efdd53 100644
--- a/project2/common/sessionSetTask.cpp
+++ b/project2/common/sessionSetTask.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include <boost/foreach.hpp>
 #include "scriptLoader.h"
 #include "sessionSetTask.h"
diff --git a/project2/common/singleton.cpp b/project2/common/singleton.cpp
index 76b99d4..d056001 100644
--- a/project2/common/singleton.cpp
+++ b/project2/common/singleton.cpp
@@ -1,8 +1,9 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "view.h"
 #include "iHaveParameters.h"
 #include "presenter.h"
 #include "scopeObject.h"
+#include <boost/foreach.hpp>
 
 class Singleton : public View {
 	public:
diff --git a/project2/common/sourceObject.cpp b/project2/common/sourceObject.cpp
index 6f5bcc5..f63a727 100644
--- a/project2/common/sourceObject.cpp
+++ b/project2/common/sourceObject.cpp
@@ -1,7 +1,8 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "sourceObject.h"
 #include "exceptions.h"
 #include "safeMapFind.h"
+#include "scripts.h"
 
 unsigned int SourceObject::loadOrder = 1;
 SimpleMessageException(ComponentNotFound);
diff --git a/project2/common/structExceptHandling.cpp b/project2/common/structExceptHandling.cpp
index 0881d6d..b2c7c83 100644
--- a/project2/common/structExceptHandling.cpp
+++ b/project2/common/structExceptHandling.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "structExceptHandling.h"
 #include "scriptLoader.h"
 #include "scriptStorage.h"
diff --git a/project2/common/task.cpp b/project2/common/task.cpp
index c4275f8..c285d3f 100644
--- a/project2/common/task.cpp
+++ b/project2/common/task.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "task.h"
 #include <boost/foreach.hpp>
 
diff --git a/project2/common/taskHost.cpp b/project2/common/taskHost.cpp
index cbfe7c3..322db35 100644
--- a/project2/common/taskHost.cpp
+++ b/project2/common/taskHost.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "taskHost.h"
 #include "noOutputExecute.h"
 #include "dataSource.h"
diff --git a/project2/common/transform.cpp b/project2/common/transform.cpp
index fc68855..46ca42e 100644
--- a/project2/common/transform.cpp
+++ b/project2/common/transform.cpp
@@ -1,7 +1,8 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "transform.h"
 #include "logger.h"
 #include "ostreamWrapper.h"
+#include "scriptStorage.h"
 #include <boost/foreach.hpp>
 
 class TransformTargetStorer : public Storer {
diff --git a/project2/common/variableConvert.cpp b/project2/common/variableConvert.cpp
index d0363f5..8fd906f 100644
--- a/project2/common/variableConvert.cpp
+++ b/project2/common/variableConvert.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "variables.h"
 #include "exceptions.h"
 #include <boost/lexical_cast.hpp>
diff --git a/project2/common/variableType.cpp b/project2/common/variableType.cpp
index 710296a..5eab163 100644
--- a/project2/common/variableType.cpp
+++ b/project2/common/variableType.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "variableType.h"
 #include "logger.h"
 #include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/project2/common/variables.cpp b/project2/common/variables.cpp
index 6f62dc1..a6619b1 100644
--- a/project2/common/variables.cpp
+++ b/project2/common/variables.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "logger.h"
 #include "variables.h"
 #include "variables/fixed.h"
diff --git a/project2/common/variables/config.cpp b/project2/common/variables/config.cpp
index 51759d5..5b38713 100644
--- a/project2/common/variables/config.cpp
+++ b/project2/common/variables/config.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "../pch.hpp"
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/localparam.cpp b/project2/common/variables/localparam.cpp
index 1b789a7..2f09b08 100644
--- a/project2/common/variables/localparam.cpp
+++ b/project2/common/variables/localparam.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "../pch.hpp"
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/lookup.cpp b/project2/common/variables/lookup.cpp
index 892968e..41326c2 100644
--- a/project2/common/variables/lookup.cpp
+++ b/project2/common/variables/lookup.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "../pch.hpp"
 #include "../variables.h"
 #include "../safeMapFind.h"
 #include "../logger.h"
diff --git a/project2/common/variables/param.cpp b/project2/common/variables/param.cpp
index 7292b0a..c985868 100644
--- a/project2/common/variables/param.cpp
+++ b/project2/common/variables/param.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "../pch.hpp"
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/variables/session.cpp b/project2/common/variables/session.cpp
index fc33d8e..2e26a12 100644
--- a/project2/common/variables/session.cpp
+++ b/project2/common/variables/session.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "../pch.hpp"
 #include "../variables.h"
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
diff --git a/project2/common/view.cpp b/project2/common/view.cpp
index 30a6491..ddbf157 100644
--- a/project2/common/view.cpp
+++ b/project2/common/view.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "view.h"
 
 View::View(ScriptNodePtr p) :
diff --git a/project2/common/viewHost.cpp b/project2/common/viewHost.cpp
index 04e0d88..4b6a6af 100644
--- a/project2/common/viewHost.cpp
+++ b/project2/common/viewHost.cpp
@@ -1,4 +1,4 @@
-#include <pch.hpp>
+#include "pch.hpp"
 #include "viewHost.h"
 #include "commonObjects.h"
 #include "transform.h"