From 3ceafa176f394676971e131db280f1c587661352 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <simon@highlyillogical.org>
Date: Wed, 14 Jan 2015 09:39:42 +0000
Subject: [PATCH] Fix compiler error by explicitly instantiating static objects

Gave error about implicit instantiation having happened first
---
 Source/Ember/Ember.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Ember/Ember.cpp b/Source/Ember/Ember.cpp
index 389d656..9748997 100644
--- a/Source/Ember/Ember.cpp
+++ b/Source/Ember/Ember.cpp
@@ -45,6 +45,12 @@ template<> unique_ptr<QTIsaac<ISAAC_SIZE, ISAAC_INT>> QTIsaac<ISAAC_SIZE, ISAAC_
 	template EMBER_API class Post##varName##Variation<T>;
 
 #define EXPORT_SINGLE_TYPE_EMBER(T) \
+	template<> bool PaletteList<T>::m_Init = false; \
+	template<> vector<Palette<T>> PaletteList<T>::m_Palettes = vector<Palette<T>>(); \
+	template<> bool XmlToEmber<T>::m_Init = false; \
+	template<> vector<string> XmlToEmber<T>::m_FlattenNames = vector<string>(); \
+	template<> vector<pair<string, string>> XmlToEmber<T>::m_BadParamNames = vector<pair<string, string>>(); \
+	template<> vector<pair<pair<string, string>, vector<string>>> XmlToEmber<T>::m_BadVariationNames = vector<pair<pair<string, string>, vector<string>>>(); \
 	template EMBER_API class Point<T>; \
 	template EMBER_API struct Color<T>; \
 	template EMBER_API class Palette<T>; \
@@ -385,13 +391,7 @@ template<> unique_ptr<QTIsaac<ISAAC_SIZE, ISAAC_INT>> QTIsaac<ISAAC_SIZE, ISAAC_
 	/*template EMBER_API class RenderCallback<T>;*/ \
 	template EMBER_API class CarToRas<T>; \
 	template EMBER_API class XmlToEmber<T>; \
-	template EMBER_API class EmberToXml<T>; \
-	template<> bool PaletteList<T>::m_Init = false; \
-	template<> vector<Palette<T>> PaletteList<T>::m_Palettes = vector<Palette<T>>(); \
-	template<> bool XmlToEmber<T>::m_Init = false; \
-	template<> vector<string> XmlToEmber<T>::m_FlattenNames = vector<string>(); \
-	template<> vector<pair<string, string>> XmlToEmber<T>::m_BadParamNames = vector<pair<string, string>>(); \
-	template<> vector<pair<pair<string, string>, vector<string>>> XmlToEmber<T>::m_BadVariationNames = vector<pair<pair<string, string>, vector<string>>>();
+	template EMBER_API class EmberToXml<T>;
 
 EXPORT_SINGLE_TYPE_EMBER(float)