diff options
51 files changed, 91 insertions, 2 deletions
diff --git a/project2/common/Jamfile.jam b/project2/common/Jamfile.jam index 2d88168..517be8e 100644 --- a/project2/common/Jamfile.jam +++ b/project2/common/Jamfile.jam @@ -7,7 +7,12 @@ lib boost_filesystem : : <name>boost_filesystem ; lib boost_date_time : : <name>boost_date_time ; lib boost_program_options : : <name>boost_program_options ; +cpp-pch pch : pch.hpp : + <include>../../libmisc + <library>libxmlpp + ; lib p2common : + pch appEngine.cpp dataSource.cpp environment.cpp fileStarGlibIoChannel.cpp iHaveParameters.cpp library.cpp iHaveSubTasks.cpp iterate.cpp paramChecker.cpp presenter.cpp logger.cpp if.cpp xmlScriptParser.cpp viewHost.cpp sourceObject.cpp task.cpp variables.cpp variableConvert.cpp view.cpp xmlObjectLoader.cpp exceptions.cpp cache.cpp diff --git a/project2/common/appEngine.cpp b/project2/common/appEngine.cpp index d8c097b..6fa71ce 100644 --- a/project2/common/appEngine.cpp +++ b/project2/common/appEngine.cpp @@ -1,5 +1,7 @@ +#include <pch.hpp> #include "appEngine.h" #include "logger.h" +#include "presenter.h" #include <stdexcept> #include <boost/foreach.hpp> diff --git a/project2/common/appEngine.h b/project2/common/appEngine.h index 689f1b5..39214d3 100644 --- a/project2/common/appEngine.h +++ b/project2/common/appEngine.h @@ -3,9 +3,10 @@ #include "environment.h" #include "session.h" -#include "presenter.h" #include "config.h" +class Presenter; + class ApplicationEngine : public Configuration { public: class Message : public IntrusivePtrBase { diff --git a/project2/common/cache.cpp b/project2/common/cache.cpp index 1dc435f..1c078fb 100644 --- a/project2/common/cache.cpp +++ b/project2/common/cache.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "cache.h" #include "rowSet.h" #include "rowProcessor.h" diff --git a/project2/common/checkHost.cpp b/project2/common/checkHost.cpp index a39c176..7f908c0 100644 --- a/project2/common/checkHost.cpp +++ b/project2/common/checkHost.cpp @@ -1,3 +1,4 @@ +#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 a2511f6..e64a9f8 100644 --- a/project2/common/columns.cpp +++ b/project2/common/columns.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "columns.h" #include <libxml++/nodes/textnode.h> diff --git a/project2/common/commonObjects.cpp b/project2/common/commonObjects.cpp index e811fe7..f398e07 100644 --- a/project2/common/commonObjects.cpp +++ b/project2/common/commonObjects.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "commonObjects.h" #include "appEngine.h" #include "xmlObjectLoader.h" diff --git a/project2/common/config.cpp b/project2/common/config.cpp index a3b9afe..adeacf2 100644 --- a/project2/common/config.cpp +++ b/project2/common/config.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "config.h" #include "exceptions.h" #include <boost/filesystem/operations.hpp> diff --git a/project2/common/dataSource.cpp b/project2/common/dataSource.cpp index e40ad64..3fedbd8 100644 --- a/project2/common/dataSource.cpp +++ b/project2/common/dataSource.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "dataSource.h" DataSource::DataSource(const xmlpp::Element * p) : diff --git a/project2/common/definedColumns.cpp b/project2/common/definedColumns.cpp index 5260e51..2db8f24 100644 --- a/project2/common/definedColumns.cpp +++ b/project2/common/definedColumns.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "definedColumns.h" #include <boost/function.hpp> #include <libxml++/nodes/textnode.h> diff --git a/project2/common/environment.cpp b/project2/common/environment.cpp index 0c563cc..3fab7ec 100644 --- a/project2/common/environment.cpp +++ b/project2/common/environment.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "environment.h" #include "loggers.h" #include "xmlObjectLoader.h" diff --git a/project2/common/exceptions.cpp b/project2/common/exceptions.cpp index ddf8e94..d347f5f 100644 --- a/project2/common/exceptions.cpp +++ b/project2/common/exceptions.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "exceptions.h" #include <stdlib.h> #include <stdio.h> diff --git a/project2/common/fileStarGlibIoChannel.cpp b/project2/common/fileStarGlibIoChannel.cpp index 3ec26ce..15f9f06 100644 --- a/project2/common/fileStarGlibIoChannel.cpp +++ b/project2/common/fileStarGlibIoChannel.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "fileStarGlibIoChannel.h" #include <stdio.h> #include <errno.h> diff --git a/project2/common/fileStrmVarWriter.cpp b/project2/common/fileStrmVarWriter.cpp index 51fb487..a6ae728 100644 --- a/project2/common/fileStrmVarWriter.cpp +++ b/project2/common/fileStrmVarWriter.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "fileStrmVarWriter.h" #include "rowSet.h" #include "xmlObjectLoader.h" diff --git a/project2/common/iHaveParameters.cpp b/project2/common/iHaveParameters.cpp index e4f456a..d3f9776 100644 --- a/project2/common/iHaveParameters.cpp +++ b/project2/common/iHaveParameters.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "iHaveParameters.h" #include "exceptions.h" #include "appEngine.h" diff --git a/project2/common/iHaveSubTasks.cpp b/project2/common/iHaveSubTasks.cpp index f78f81e..dae8640 100644 --- a/project2/common/iHaveSubTasks.cpp +++ b/project2/common/iHaveSubTasks.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "iHaveSubTasks.h" #include <boost/foreach.hpp> diff --git a/project2/common/if.cpp b/project2/common/if.cpp index cf5c156..677cd63 100644 --- a/project2/common/if.cpp +++ b/project2/common/if.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "if.h" #include "logger.h" #include "xmlObjectLoader.h" diff --git a/project2/common/iterate.cpp b/project2/common/iterate.cpp index 119e839..ddde42c 100644 --- a/project2/common/iterate.cpp +++ b/project2/common/iterate.cpp @@ -1,3 +1,4 @@ +#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 b1e0b9b..103cb4e 100644 --- a/project2/common/library.cpp +++ b/project2/common/library.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include <dlfcn.h> #include "xmlStorage.h" #include "exceptions.h" diff --git a/project2/common/logger.cpp b/project2/common/logger.cpp index 6133ce9..b43efa8 100644 --- a/project2/common/logger.cpp +++ b/project2/common/logger.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #define SYSLOG_NAMES 1 // Enables the definition of names in syslog.h #include "logger.h" diff --git a/project2/common/noOutputExecute.cpp b/project2/common/noOutputExecute.cpp index 3bfa0e9..5b1cb36 100644 --- a/project2/common/noOutputExecute.cpp +++ b/project2/common/noOutputExecute.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "noOutputExecute.h" #include <boost/foreach.hpp> diff --git a/project2/common/paramChecker.cpp b/project2/common/paramChecker.cpp index 0781e90..164d7a3 100644 --- a/project2/common/paramChecker.cpp +++ b/project2/common/paramChecker.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "paramChecker.h" #include "xmlObjectLoader.h" diff --git a/project2/common/pch.hpp b/project2/common/pch.hpp new file mode 100644 index 0000000..708b437 --- /dev/null +++ b/project2/common/pch.hpp @@ -0,0 +1,35 @@ +#ifdef BOOST_BUILD_PCH_ENABLED +#ifndef COMMON_PCH +#define COMMON_PCH + +#include <algorithm> +#include <boost/bind.hpp> +#include <boost/filesystem/path.hpp> +#include <boost/foreach.hpp> +#include <boost/function.hpp> +#include <boost/intrusive_ptr.hpp> +#include <boost/program_options.hpp> +#include <boost/shared_ptr.hpp> +#include <boost/variant.hpp> +#include <glibmm/ustring.h> +#include <intrusivePtrBase.h> +#include <iostream> +#include <libxml++/attribute.h> +#include <libxml++/nodes/element.h> +#include <libxml++/nodes/textnode.h> +#include <list> +#include <map> +#include <set> +#include <stdexcept> +#include <stdio.h> +#include <string.h> +#include <string> +#include <vector> +#include "xmlStorage.h" +#include "xmlObjectLoader.h" +#include "variables.h" +#include "sourceObject.h" + +#endif +#endif + diff --git a/project2/common/presenter.cpp b/project2/common/presenter.cpp index 9544743..48dd27e 100644 --- a/project2/common/presenter.cpp +++ b/project2/common/presenter.cpp @@ -1,3 +1,4 @@ +#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 4ea89fd..8161aaf 100644 --- a/project2/common/rowProcessor.cpp +++ b/project2/common/rowProcessor.cpp @@ -1,3 +1,4 @@ +#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 6902fd3..77d2a2d 100644 --- a/project2/common/rowSet.cpp +++ b/project2/common/rowSet.cpp @@ -1,3 +1,4 @@ +#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 092192f..014e648 100644 --- a/project2/common/rowView.cpp +++ b/project2/common/rowView.cpp @@ -1,3 +1,4 @@ +#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 268fd2c..e28e642 100644 --- a/project2/common/scopeObject.cpp +++ b/project2/common/scopeObject.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "scopeObject.h" #include "logger.h" diff --git a/project2/common/session.cpp b/project2/common/session.cpp index 6246068..548fa4f 100644 --- a/project2/common/session.cpp +++ b/project2/common/session.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "session.h" Session::Session() diff --git a/project2/common/sessionClearTask.cpp b/project2/common/sessionClearTask.cpp index 15ba270..0781c54 100644 --- a/project2/common/sessionClearTask.cpp +++ b/project2/common/sessionClearTask.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include <boost/foreach.hpp> #include "xmlObjectLoader.h" #include "sessionClearTask.h" diff --git a/project2/common/sessionContainer.cpp b/project2/common/sessionContainer.cpp index 635889b..15e8d47 100644 --- a/project2/common/sessionContainer.cpp +++ b/project2/common/sessionContainer.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sessionContainer.h" #include "environment.h" diff --git a/project2/common/sessionSetTask.cpp b/project2/common/sessionSetTask.cpp index 4ae344f..7a90bca 100644 --- a/project2/common/sessionSetTask.cpp +++ b/project2/common/sessionSetTask.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include <boost/foreach.hpp> #include "xmlObjectLoader.h" #include "sessionSetTask.h" diff --git a/project2/common/sourceObject.cpp b/project2/common/sourceObject.cpp index a5736ba..9de39b4 100644 --- a/project2/common/sourceObject.cpp +++ b/project2/common/sourceObject.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "sourceObject.h" unsigned int SourceObject::loadOrder = 1; diff --git a/project2/common/structExceptHandling.cpp b/project2/common/structExceptHandling.cpp index f87b870..56b3108 100644 --- a/project2/common/structExceptHandling.cpp +++ b/project2/common/structExceptHandling.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "structExceptHandling.h" #include "xmlObjectLoader.h" #include "xmlStorage.h" diff --git a/project2/common/task.cpp b/project2/common/task.cpp index 5f828ef..823382b 100644 --- a/project2/common/task.cpp +++ b/project2/common/task.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "task.h" #include <boost/foreach.hpp> diff --git a/project2/common/taskHost.cpp b/project2/common/taskHost.cpp index 63ab301..502e273 100644 --- a/project2/common/taskHost.cpp +++ b/project2/common/taskHost.cpp @@ -1,3 +1,4 @@ +#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 37524a0..d109c19 100644 --- a/project2/common/transform.cpp +++ b/project2/common/transform.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "transform.h" #include "logger.h" #include <boost/foreach.hpp> diff --git a/project2/common/validDateCheck.cpp b/project2/common/validDateCheck.cpp index 410a003..4e2fa49 100644 --- a/project2/common/validDateCheck.cpp +++ b/project2/common/validDateCheck.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "logger.h" #include "xmlObjectLoader.h" #include "commonObjects.h" diff --git a/project2/common/variableConvert.cpp b/project2/common/variableConvert.cpp index b144175..f0e42c9 100644 --- a/project2/common/variableConvert.cpp +++ b/project2/common/variableConvert.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "exceptions.h" #include <boost/lexical_cast.hpp> diff --git a/project2/common/variables-modconfig.cpp b/project2/common/variables-modconfig.cpp index 88fddd4..c9a6b2c 100644 --- a/project2/common/variables-modconfig.cpp +++ b/project2/common/variables-modconfig.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "xmlObjectLoader.h" #include "xmlStorage.h" diff --git a/project2/common/variables-modlocalparam.cpp b/project2/common/variables-modlocalparam.cpp index 24e1d54..957f76a 100644 --- a/project2/common/variables-modlocalparam.cpp +++ b/project2/common/variables-modlocalparam.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "xmlObjectLoader.h" #include "logger.h" diff --git a/project2/common/variables-modlookup.cpp b/project2/common/variables-modlookup.cpp index 85a1fbe..836bfea 100644 --- a/project2/common/variables-modlookup.cpp +++ b/project2/common/variables-modlookup.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "safeMapFind.h" #include "logger.h" diff --git a/project2/common/variables-modparam.cpp b/project2/common/variables-modparam.cpp index 0b205db..4908a89 100644 --- a/project2/common/variables-modparam.cpp +++ b/project2/common/variables-modparam.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "xmlObjectLoader.h" #include "xmlStorage.h" diff --git a/project2/common/variables-modsession.cpp b/project2/common/variables-modsession.cpp index 963a105..27f1db2 100644 --- a/project2/common/variables-modsession.cpp +++ b/project2/common/variables-modsession.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "xmlObjectLoader.h" #include "xmlStorage.h" diff --git a/project2/common/variables-moduri.cpp b/project2/common/variables-moduri.cpp index 00fb7bf..f91423a 100644 --- a/project2/common/variables-moduri.cpp +++ b/project2/common/variables-moduri.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "xmlObjectLoader.h" #include "xmlStorage.h" diff --git a/project2/common/variables.cpp b/project2/common/variables.cpp index 9108889..18ddbde 100644 --- a/project2/common/variables.cpp +++ b/project2/common/variables.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "variables.h" #include "iHaveParameters.h" #include "xmlObjectLoader.h" diff --git a/project2/common/view.cpp b/project2/common/view.cpp index ad9ef1f..34ff3d4 100644 --- a/project2/common/view.cpp +++ b/project2/common/view.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "view.h" View::View(const xmlpp::Element * p) : diff --git a/project2/common/viewHost.cpp b/project2/common/viewHost.cpp index 3c7f8c6..9157e01 100644 --- a/project2/common/viewHost.cpp +++ b/project2/common/viewHost.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "viewHost.h" #include "transform.h" #include <boost/foreach.hpp> diff --git a/project2/common/xmlObjectLoader.cpp b/project2/common/xmlObjectLoader.cpp index 14d2972..6859f22 100644 --- a/project2/common/xmlObjectLoader.cpp +++ b/project2/common/xmlObjectLoader.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xmlObjectLoader.h" #include "xmlStorage.h" #include "logger.h" diff --git a/project2/common/xmlScriptParser.cpp b/project2/common/xmlScriptParser.cpp index 9b76316..762618a 100644 --- a/project2/common/xmlScriptParser.cpp +++ b/project2/common/xmlScriptParser.cpp @@ -1,3 +1,4 @@ +#include <pch.hpp> #include "xmlScriptParser.h" #include <libxml/xinclude.h> #include <boost/filesystem/convenience.hpp> diff --git a/project2/uuid/uuid.h b/project2/uuid/uuid.h index 4c60ae5..0712f8f 100644 --- a/project2/uuid/uuid.h +++ b/project2/uuid/uuid.h @@ -1,7 +1,7 @@ #ifndef UUID_H #define UUID_H -#include <iostream> +#include <string> #ifndef uuid_impl class uuid_impl; |