From 579bef6dbc2d82f5f0c4129a78a1abc6899746b0 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Tue, 8 Oct 2013 09:35:10 +0000
Subject: GCC 4.8 compat fixes

---
 project2/common/scripts.cpp | 1 -
 project2/files/fsRows.h     | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/project2/common/scripts.cpp b/project2/common/scripts.cpp
index 0f798a7..a4a036d 100644
--- a/project2/common/scripts.cpp
+++ b/project2/common/scripts.cpp
@@ -60,7 +60,6 @@ ScriptReader::load(const CommonObjects * co, bool childrenOnly) const
 ScriptReaderPtr
 ScriptReader::resolveScript(const std::string & group, const std::string & name, bool ii)
 {
-	typedef std::map<std::string, boost::shared_ptr<ScriptReaderLoader> > ReaderLoaders;
 	boost::filesystem::path e(name);
 	while (!e.empty()) {
 		ScriptKey sk(group, e.string());
diff --git a/project2/files/fsRows.h b/project2/files/fsRows.h
index fe4322c..2e44750 100644
--- a/project2/files/fsRows.h
+++ b/project2/files/fsRows.h
@@ -29,13 +29,13 @@ class FsRows : public RowSet {
 		class SpecBaseLoaderX : public GenLoader<SpecBase, std::string, ScriptNodePtr> {
 			public:
 				virtual SpecBase * createWith(const Glib::ustring &) const = 0;
-				template <class T>
-				class For : public SpecBaseLoaderX<X> {
+				template <class T, class BaseLoader = SpecBaseLoaderX<X>>
+				class For : public BaseLoader {
 					public:
-						SpecBase * create(const ScriptNodePtr & v) const {
+						inline SpecBase * create(const ScriptNodePtr & v) const {
 							return new T(v);
 						}
-						SpecBase * createWith(const Glib::ustring & v) const {
+						inline SpecBase * createWith(const Glib::ustring & v) const {
 							return new T(v);
 						}
 				};
-- 
cgit v1.2.3