Remove DECLARE_TYPEOF

It is no longer needed since C++11

src/script/dependency.cpp

@@ -12,9 +12,6 @@
 #include <util/error.hpp>
 #include <queue>
 
-DECLARE_TYPEOF_COLLECTION(ScriptValueP);
-DECLARE_TYPEOF_COLLECTION(Context::Binding);
-
 // NOTE: dependency.cpp has nothing to do with dependency.hpp, the latter defines the dependency
 // type, which is used here as an abstract type. The header for this source file is context.hpp
 

src/script/functions/basic.cpp

@@ -18,8 +18,6 @@
 #include <data/game.hpp>
 #include <random>
 
-DECLARE_TYPEOF_COLLECTION(pair<String COMMA ScriptValueP>);
-
 // ----------------------------------------------------------------------------- : Debugging
 
 SCRIPT_FUNCTION(trace) {

src/script/functions/editor.cpp

@@ -19,12 +19,6 @@
 #include <data/field/multiple_choice.hpp>
 #include <data/action/value.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_COLLECTION(TextValue*);
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(pair<String COMMA bool>);
-DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : Combined editor
 
 // Combining multiple (text) values into a single one

src/script/functions/export.cpp

@@ -21,8 +21,6 @@
 #include <wx/wfstream.h>
 #include <wx/filename.h>
 
-DECLARE_TYPEOF_COLLECTION(SymbolFont::DrawableSymbol);
-
 // ----------------------------------------------------------------------------- : Utility
 
 // Make sure we can export files to a data directory
@@ -87,8 +85,6 @@ struct NegTag {
   NegTag(Tag* tag, bool neg) : tag(tag), neg(neg) {}
 };
 
-DECLARE_TYPEOF_COLLECTION(NegTag);
-
 /// A stack of opened HTML tags
 class TagStack {
   public:

src/script/functions/image.cpp

@@ -19,8 +19,6 @@
 #include <gfx/generated_image.hpp>
 #include <render/symbol/filter.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolVariationP);
-
 void parse_enum(const String&, ImageCombine& out);
 
 // ----------------------------------------------------------------------------- : Utility

src/script/functions/regex.cpp

@@ -13,7 +13,6 @@
 #include <util/error.hpp>
 
 DECLARE_POINTER_TYPE(ScriptRegex);
-DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
 
 // ----------------------------------------------------------------------------- : Regex type
 

src/script/parser.cpp

@@ -14,8 +14,6 @@
 #include <util/io/package_manager.hpp> // for "include file" semi hack
 #include <stack>
 
-DECLARE_TYPEOF_COLLECTION(Variable);
-
 #ifdef __WXMSW__
 #define TokenType TokenType_ // some stupid windows header uses our name
 #endif

src/script/profiler.cpp

@@ -16,8 +16,6 @@
   #error "It looks like you are building the final release; disable USE_SCRIPT_PROFILING!"
 #endif
 
-DECLARE_TYPEOF(map<size_t COMMA FunctionProfileP>);
-
 // ----------------------------------------------------------------------------- : Timer
 
 Timer::Timer() {

src/script/script.cpp

@@ -16,7 +16,6 @@
 
 typedef map<String, Variable> Variables;
 Variables variables;
-DECLARE_TYPEOF(Variables);
 #ifdef _DEBUG
   vector<String> variable_names;
 #endif
@@ -148,8 +147,6 @@ unsigned int Script::getLabel() const {
   return (unsigned int)instructions.size();
 }
 
-DECLARE_TYPEOF_COLLECTION(Instruction);
-
 #ifdef _DEBUG // debugging
 
 String Script::dumpScript() const {

src/script/scriptable.cpp

@@ -17,8 +17,6 @@
 Alignment from_string(const String&);
 void parse_enum(const String&,Direction&);
 
-DECLARE_TYPEOF_COLLECTION(ScriptParseError);
-
 // ----------------------------------------------------------------------------- : Store
 
 void store(const ScriptValueP& val, String& var)              { var = val->toString(); }

src/script/value.cpp

@@ -14,8 +14,6 @@
 #include <util/error.hpp>
 #include <boost/pool/singleton_pool.hpp>
 
-DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
-
 // ----------------------------------------------------------------------------- : ScriptValue
 // Base cases