GCC 4.6 workaround for vector of objects with consts

Make options much more flexible with Boost function interface

2 files changed, 19 insertions, 10 deletions

diff --git a/project2/cgi/cgiContentNegotiate.cpp b/project2/cgi/cgiContentNegotiate.cpp
index 176441e..2ed54c9 100644
--- a/project2/cgi/cgiContentNegotiate.cpp
+++ b/project2/cgi/cgiContentNegotiate.cpp
@@ -10,11 +10,13 @@ class ContentNegotiateLoader : public PresenterLoader {
 			opts("Content negotiation options")
 		{
 			opts
-				("cgi.contentnegotiation.mappedtype", Options::value(&mappedTypes),
+				("cgi.contentnegotiation.mappedtype", Options::functions(
+						[this](const VariableType & v) { mappedTypes.push_back(new MappedType(v)); },
+						boost::bind(&MappedTypes::clear, &mappedTypes)),
 				 "mimetype=presenter list of types to negotiate")
 				;
 		}
-		
+
 		const Options * options() const { return &opts; }
 
 		MultiRowSetPresenter * create(const ScriptNodePtr & s, const ObjectSource & os) const
@@ -25,16 +27,16 @@ class ContentNegotiateLoader : public PresenterLoader {
 				const auto mimetype = mimetypeAndWeight.substr(0, mimetypeAndWeight.find(';'));
 				if (mimetype == "*/*") break;
 				BOOST_FOREACH(const auto & t, mappedTypes) {
-					if (t.Matches(mimetype)) {
-						return PresenterLoader::getFor(t.present)->create(s, os);
+					if (t->Matches(mimetype)) {
+						return PresenterLoader::getFor(t->present)->create(s, os);
 					}
 				}
 			}
-			return PresenterLoader::getFor(mappedTypes.begin()->present)->create(s, os);
+			return PresenterLoader::getFor((*mappedTypes.begin())->present)->create(s, os);
 		}
 
 		Options opts;
-		class MappedType {
+		class MappedType : public IntrusivePtrBase {
 			public:
 				MappedType(const std::string & val) :
 					accept(val.substr(0, val.find('='))),
@@ -50,7 +52,9 @@ class ContentNegotiateLoader : public PresenterLoader {
 				const std::string accept;
 				const std::string present;
 		};
-		std::vector<MappedType> mappedTypes;
+		typedef boost::intrusive_ptr<MappedType> MappedTypePtr;
+		typedef std::vector<MappedTypePtr> MappedTypes;
+		MappedTypes mappedTypes;
 
 		bool cacheable() const { return false; }
 };
diff --git a/project2/cgi/cgiProgRouter.cpp b/project2/cgi/cgiProgRouter.cpp
index d094598..932242e 100644
--- a/project2/cgi/cgiProgRouter.cpp
+++ b/project2/cgi/cgiProgRouter.cpp
@@ -12,7 +12,7 @@ typedef std::map<std::string, std::string> VarMap;
 
 class RoutingTable {
 	public:
-		RoutingTable & operator=(const std::string & routeFile) {
+		void loadRoutesFromFile(const std::string & routeFile) {
 			routeScriptPath = routeFile;
 			if (routeFile.empty()) {
 				routes.clear();
@@ -21,7 +21,10 @@ class RoutingTable {
 			else {
 				setRouteScript();
 			}
-			return *this;
+		}
+
+		void clearRoutes() {
+			routes.clear();
 		}
 
 		void onBefore()
@@ -128,7 +131,9 @@ class ProgRouterLoader : public RouterLoader::For<ProgRouter> {
 			opts("CGI Prog Router options")
 		{
 			opts
-				("cgi.progRouter.routes", Options::value(&routingTable),
+				("cgi.progRouter.routes", Options::functions(
+						boost::bind(&RoutingTable::loadRoutesFromFile, &routingTable, _1),
+						boost::bind(&RoutingTable::clearRoutes, &routingTable)),
 				 "Script file defining web service routes")
 				;
 		}