summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2015-08-21 00:56:59 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2015-08-21 00:56:59 +0100
commitde12a74e3f3db4fb4ee421d10ccec8bcd4563384 (patch)
treecb8f5fc43068f726995d4527b78240aaa02c56a2
parentExplicit conversion for boost-1.57 compat (diff)
downloadproject2-de12a74e3f3db4fb4ee421d10ccec8bcd4563384.tar.bz2
project2-de12a74e3f3db4fb4ee421d10ccec8bcd4563384.tar.xz
project2-de12a74e3f3db4fb4ee421d10ccec8bcd4563384.zip
Move more stuff from common to basics
-rw-r--r--project2/basics/Jamfile.jam2
-rw-r--r--project2/basics/if.cpp (renamed from project2/common/if.cpp)0
-rw-r--r--project2/basics/if.h (renamed from project2/common/if.h)0
-rw-r--r--project2/basics/tasks/iterate.cpp (renamed from project2/common/iterate.cpp)0
-rw-r--r--project2/basics/tasks/iterate.h (renamed from project2/common/iterate.h)0
-rw-r--r--project2/cgi/cgiAppEngine.cpp1
-rw-r--r--project2/console/pch.hpp1
-rw-r--r--project2/sql/Jamfile.jam1
-rw-r--r--project2/sql/sqlMergeTask.h2
9 files changed, 3 insertions, 4 deletions
diff --git a/project2/basics/Jamfile.jam b/project2/basics/Jamfile.jam
index 19726d9..c540c68 100644
--- a/project2/basics/Jamfile.jam
+++ b/project2/basics/Jamfile.jam
@@ -9,7 +9,7 @@ build-project unittests ;
cpp-pch pch : pch.hpp :
<include>../../libmisc
- <library>glibmm
+ <library>glibmm
<library>../common//p2common
;
diff --git a/project2/common/if.cpp b/project2/basics/if.cpp
index bdd9835..bdd9835 100644
--- a/project2/common/if.cpp
+++ b/project2/basics/if.cpp
diff --git a/project2/common/if.h b/project2/basics/if.h
index 64f885b..64f885b 100644
--- a/project2/common/if.h
+++ b/project2/basics/if.h
diff --git a/project2/common/iterate.cpp b/project2/basics/tasks/iterate.cpp
index ae73cdb..ae73cdb 100644
--- a/project2/common/iterate.cpp
+++ b/project2/basics/tasks/iterate.cpp
diff --git a/project2/common/iterate.h b/project2/basics/tasks/iterate.h
index 2afbe98..2afbe98 100644
--- a/project2/common/iterate.h
+++ b/project2/basics/tasks/iterate.h
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index 7de9218..53e0c95 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -6,7 +6,6 @@
#include <cgicc/HTTPHeader.h>
#include <cgicc/HTTPStatusHeader.h>
#include "cgiRequestContext.h"
-#include "iterate.h"
#include <boost/bind.hpp>
#include "ostreamWrapper.h"
#include "scopeObject.h"
diff --git a/project2/console/pch.hpp b/project2/console/pch.hpp
index e79f446..fa98d28 100644
--- a/project2/console/pch.hpp
+++ b/project2/console/pch.hpp
@@ -5,7 +5,6 @@
#include "consoleAppEngine.h"
#include "consolePresenter.h"
#include "exceptions.h"
-#include "iterate.h"
#include "logger.h"
#include "scriptLoader.h"
#include <boost/bind.hpp>
diff --git a/project2/sql/Jamfile.jam b/project2/sql/Jamfile.jam
index 8a3661b..17c0223 100644
--- a/project2/sql/Jamfile.jam
+++ b/project2/sql/Jamfile.jam
@@ -75,6 +75,7 @@ lib p2sql :
<library>glibmm
<library>boost_filesystem
<library>../common//p2common
+ <library>../basics//p2basics
<library>../lib//p2lib
<include>../../libmisc
<library>fl
diff --git a/project2/sql/sqlMergeTask.h b/project2/sql/sqlMergeTask.h
index eec98cd..07b7ffb 100644
--- a/project2/sql/sqlMergeTask.h
+++ b/project2/sql/sqlMergeTask.h
@@ -7,7 +7,7 @@
#include <buffer.h>
#include "tablepatch.h"
#include "task.h"
-#include "iterate.h"
+#include <tasks/iterate.h>
#include "variables.h"
#include "sqlWriter.h"
#include "rdbmsDataSource.h"