Partially tested global visibility hidden in all projects

7 files changed, 10 insertions, 9 deletions

diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h
index d8271b5..b9a30d9 100644
--- a/project2/cgi/cgiAppEngine.h
+++ b/project2/cgi/cgiAppEngine.h
@@ -17,6 +17,7 @@
 #include "cgiRequestContext.h"
 #include <cgicc/Cgicc.h>
 #include <appInstance.h>
+#include <visibility.h>
 
 class Session;
 namespace cgicc {
@@ -24,7 +25,7 @@ namespace cgicc {
 	class CgiEnvironment;
 }
 
-class CgiApplicationEngine : AppInstance {
+class DLL_PUBLIC CgiApplicationEngine : AppInstance {
 	public:
 		typedef boost::shared_ptr<Project2HttpHeader> HttpHeaderPtr;
 		typedef std::pair<Glib::ustring, Glib::RefPtr<Glib::Regex>> PlatformHostname;
diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp
index 0d1bbaf..beff91c 100644
--- a/project2/cgi/cgiContentNegotiate.cpp
+++ b/project2/cgi/cgiContentNegotiate.cpp
@@ -5,7 +5,7 @@
 
 class ContentNegotiateFactory : public PresenterFactory {
 	public:
-		MultiRowSetPresenter * create(const ScriptNodePtr & s, const ObjectSource & os, ExecContext * const & ec) const
+		MultiRowSetPresenter * create(const ScriptNode * const & s, const ObjectSource & os, ExecContext * const & ec) const override
 		{
 			auto accept = static_cast<const CgiRequestContext *>(ec)->getAccept();
 			typedef boost::tokenizer<boost::char_separator<char>> tokenizer;
diff --git a/project2/cgi/cgiOutputOptions.cpp b/project2/cgi/cgiOutputOptions.cpp
index 07dbf79..56590ff 100644
--- a/project2/cgi/cgiOutputOptions.cpp
+++ b/project2/cgi/cgiOutputOptions.cpp
@@ -32,5 +32,5 @@ DECLARE_OPTIONS(OutputOptions, "CGI default output options")
 END_OPTIONS(OutputOptions)
 
 NAMEDFACTORY("outputoptions", OutputOptions, OutputOptionsFactory)
-INSTANTIATEFACTORY(OutputOptions, ScriptNodePtr);
+INSTANTIATEFACTORY(OutputOptions, const ScriptNode *);
 
diff --git a/project2/cgi/cgiOutputOptions.h b/project2/cgi/cgiOutputOptions.h
index 6c40388..9914665 100644
--- a/project2/cgi/cgiOutputOptions.h
+++ b/project2/cgi/cgiOutputOptions.h
@@ -30,6 +30,6 @@ class OutputOptions : public IntrusivePtrBase {
 		static bool parameters;
 };
 typedef boost::intrusive_ptr<OutputOptions> OutputOptionsPtr;
-typedef AdHoc::Factory<OutputOptions, ScriptNodePtr> OutputOptionsFactory;
+typedef AdHoc::Factory<OutputOptions, const ScriptNode *> OutputOptionsFactory;
 
 #endif
diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp
index 562b922..9993441 100644
--- a/project2/cgi/cgiProgRouter.cpp
+++ b/project2/cgi/cgiProgRouter.cpp
@@ -16,7 +16,7 @@ typedef std::map<std::string, std::string> VarMap;
 class RoutingTable {
 	public:
 		class Route;
-		typedef AdHoc::Factory<RoutingTable::Route, ScriptNodePtr> RouteFactory;
+		typedef AdHoc::Factory<RoutingTable::Route, const ScriptNode *> RouteFactory;
 
 		void loadRoutesFromFile(const std::string & routeFile) {
 			routeScriptPath = routeFile;
@@ -224,5 +224,5 @@ class Routes : public RowSet {
 };
 
 NAMEDFACTORY("routes", Routes, RowSetFactory);
-INSTANTIATEFACTORY(RoutingTable::Route, ScriptNodePtr);
+INSTANTIATEFACTORY(RoutingTable::Route, const ScriptNode *);
 
diff --git a/project2/cgi/cgiStageDefaultError.cpp b/project2/cgi/cgiStageDefaultError.cpp
index e5d1b9f..f932f78 100644
--- a/project2/cgi/cgiStageDefaultError.cpp
+++ b/project2/cgi/cgiStageDefaultError.cpp
@@ -16,7 +16,7 @@ CgiApplicationEngine::DefaultErrorStage::DefaultErrorStage(const std::exception
 	auto xp = dynamic_cast<TransformSource *>(pres.get());
 	auto cp = dynamic_cast<ContentPresenter *>(pres.get());
 	if (xp && cp && cp->contentType == CgiApplicationEngine::transformContentType) {
-		auto h = TransformTargetFactory::createNew(CgiApplicationEngine::transformTargetType, root, Default);
+		auto h = TransformTargetFactory::createNew(CgiApplicationEngine::transformTargetType, root.get(), Default);
 		xp->addTarget(h, crc, root);
 	}
 }
diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp
index dffc98e..04fae92 100644
--- a/project2/cgi/cgiStagePresent.cpp
+++ b/project2/cgi/cgiStagePresent.cpp
@@ -11,11 +11,11 @@ CgiApplicationEngine::PresentStage::PresentStage(ScriptReaderPtr s, CgiRequestCo
 	CheckHost(s->root()),
 	ViewHost(s->root()),
 	presenter([this, crc] {
-			auto p = PresenterFactory::createNew(CgiApplicationEngine::defaultPresenter, root, Default, crc);
+			auto p = PresenterFactory::createNew(CgiApplicationEngine::defaultPresenter, root.get(), Default, crc);
 			auto xp = dynamic_cast<TransformSource *>(p);
 			auto cp = dynamic_cast<ContentPresenter *>(p);
 			if (xp && cp && cp->contentType == CgiApplicationEngine::transformContentType) {
-				auto h = TransformTargetFactory::createNew(CgiApplicationEngine::transformTargetType, root, Default);
+				auto h = TransformTargetFactory::createNew(CgiApplicationEngine::transformTargetType, root.get(), Default);
 				xp->addTarget(h, crc, root);
 			}
 			return p;