Fix compilation in g++5.3 / Slackware 14.2

codereader · Jan 7, 2017 · 7898bf9 · 7898bf9
1 parent f21215b
commit 7898bf9
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/plugins/mapdoom3/Doom3MapFormat.cpp b/plugins/mapdoom3/Doom3MapFormat.cpp
@@ -39,8 +39,8 @@ const StringSet& Doom3MapFormat::getDependencies() const
 		_dependencies.insert(MODULE_ECLASSMANAGER);
 		_dependencies.insert(MODULE_LAYERSYSTEM);
 		_dependencies.insert(MODULE_BRUSHCREATOR);
-		_dependencies.insert(MODULE_PATCH + DEF2);
-		_dependencies.insert(MODULE_PATCH + DEF3);
+		_dependencies.insert(MODULE_PATCHDEF2);
+		_dependencies.insert(MODULE_PATCHDEF3);
 		_dependencies.insert(MODULE_XMLREGISTRY);
 		_dependencies.insert(MODULE_MAPFORMATMANAGER);
 	}

diff --git a/plugins/mapdoom3/Quake3MapFormat.cpp b/plugins/mapdoom3/Quake3MapFormat.cpp
@@ -42,8 +42,8 @@ const StringSet& Quake3MapFormat::getDependencies() const
 		_dependencies.insert(MODULE_ECLASSMANAGER);
 		_dependencies.insert(MODULE_LAYERSYSTEM);
 		_dependencies.insert(MODULE_BRUSHCREATOR);
-		_dependencies.insert(MODULE_PATCH + DEF2);
-		_dependencies.insert(MODULE_PATCH + DEF3);
+		_dependencies.insert(MODULE_PATCHDEF2);
+		_dependencies.insert(MODULE_PATCHDEF3);
 		_dependencies.insert(MODULE_XMLREGISTRY);
 		_dependencies.insert(MODULE_GAMEMANAGER);
 		_dependencies.insert(MODULE_MAPFORMATMANAGER);

diff --git a/plugins/mapdoom3/Quake4MapFormat.cpp b/plugins/mapdoom3/Quake4MapFormat.cpp
@@ -42,8 +42,8 @@ const StringSet& Quake4MapFormat::getDependencies() const
 		_dependencies.insert(MODULE_ECLASSMANAGER);
 		_dependencies.insert(MODULE_LAYERSYSTEM);
 		_dependencies.insert(MODULE_BRUSHCREATOR);
-		_dependencies.insert(MODULE_PATCH + DEF2);
-		_dependencies.insert(MODULE_PATCH + DEF3);
+		_dependencies.insert(MODULE_PATCHDEF2);
+		_dependencies.insert(MODULE_PATCHDEF3);
 		_dependencies.insert(MODULE_XMLREGISTRY);
 		_dependencies.insert(MODULE_GAMEMANAGER);
 		_dependencies.insert(MODULE_MAPFORMATMANAGER);

diff --git a/plugins/mapdoom3/primitiveparsers/PatchDef2.cpp b/plugins/mapdoom3/primitiveparsers/PatchDef2.cpp
@@ -37,7 +37,7 @@ patchDef2
 */
 scene::INodePtr PatchDef2Parser::parse(parser::DefTokeniser& tok) const
 {
-	scene::INodePtr node = GlobalPatchCreator(DEF2).createPatch();
+	scene::INodePtr node = GlobalPatchCreator(PatchDefType::Def2).createPatch();
 
 	IPatchNodePtr patchNode = std::dynamic_pointer_cast<IPatchNode>(node);
 	assert(patchNode != NULL);

diff --git a/plugins/mapdoom3/primitiveparsers/PatchDef3.cpp b/plugins/mapdoom3/primitiveparsers/PatchDef3.cpp
@@ -36,7 +36,7 @@ patchDef3
 */
 scene::INodePtr PatchDef3Parser::parse(parser::DefTokeniser& tok) const
 {
-	scene::INodePtr node = GlobalPatchCreator(DEF3).createPatch();
+	scene::INodePtr node = GlobalPatchCreator(PatchDefType::Def3).createPatch();
 
 	IPatchNodePtr patchNode = std::dynamic_pointer_cast<IPatchNode>(node);
 	assert(patchNode != NULL);

diff --git a/plugins/script/interfaces/PatchInterface.cpp b/plugins/script/interfaces/PatchInterface.cpp
@@ -200,7 +200,7 @@ PatchControl ScriptPatchNode::_emptyPatchControl;
 ScriptSceneNode PatchInterface::createPatchDef2()
 {
 	// Create a new patch and return the script scene node
-	scene::INodePtr node = GlobalPatchCreator(DEF2).createPatch();
+	scene::INodePtr node = GlobalPatchCreator(PatchDefType::Def2).createPatch();
 
 	// Add the node to the buffer otherwise it will be deleted immediately,
 	// as ScriptSceneNodes are using weak_ptrs.
@@ -212,7 +212,7 @@ ScriptSceneNode PatchInterface::createPatchDef2()
 ScriptSceneNode PatchInterface::createPatchDef3()
 {
 	// Create a new patch and return the script scene node
-	scene::INodePtr node = GlobalPatchCreator(DEF3).createPatch();
+	scene::INodePtr node = GlobalPatchCreator(PatchDefType::Def3).createPatch();
 
 	// Add the node to the buffer otherwise it will be deleted immediately,
 	// as ScriptSceneNodes are using weak_ptrs.

diff --git a/radiant/patch/PatchCreators.cpp b/radiant/patch/PatchCreators.cpp
@@ -36,7 +36,7 @@ scene::INodePtr Doom3PatchCreator::createPatch()
 // RegisterableModule implementation
 const std::string& Doom3PatchCreator::getName() const
 {
-	static std::string _name(MODULE_PATCH + DEF3);
+	static std::string _name(MODULE_PATCHDEF3);
 	return _name;
 }
 
@@ -152,7 +152,7 @@ scene::INodePtr Doom3PatchDef2Creator::createPatch()
 // RegisterableModule implementation
 const std::string& Doom3PatchDef2Creator::getName() const
 {
-	static std::string _name(MODULE_PATCH + DEF2);
+	static std::string _name(MODULE_PATCHDEF2);
 	return _name;
 }
 

diff --git a/radiant/patch/algorithm/General.cpp b/radiant/patch/algorithm/General.cpp
@@ -20,7 +20,7 @@ namespace algorithm
 void thicken(const PatchNodePtr& sourcePatch, float thickness, bool createSeams, int axis)
 {
 	// Get a shortcut to the patchcreator
-	PatchCreator& patchCreator = GlobalPatchCreator(DEF2);
+	PatchCreator& patchCreator = GlobalPatchCreator(PatchDefType::Def2);
 
 	// Create a new patch node
 	scene::INodePtr node(patchCreator.createPatch());

diff --git a/radiant/patch/algorithm/Prefab.cpp b/radiant/patch/algorithm/Prefab.cpp
@@ -31,7 +31,7 @@ void constructPrefab(const AABB& aabb, const std::string& shader, EPatchPrefab e
 {
 	GlobalSelectionSystem().setSelectedAll(false);
 
-	scene::INodePtr node(GlobalPatchCreator(DEF2).createPatch());
+	scene::INodePtr node(GlobalPatchCreator(PatchDefType::Def2).createPatch());
 	GlobalMap().findOrInsertWorldspawn()->addChildNode(node);
 
 	Patch* patch = Node_getPatch(node);
@@ -266,7 +266,7 @@ void createCaps(Patch& patch, const scene::INodePtr& parent, EPatchCap type, con
 	assert(parent != NULL);
 
 	{
-		scene::INodePtr cap(GlobalPatchCreator(DEF2).createPatch());
+		scene::INodePtr cap(GlobalPatchCreator(PatchDefType::Def2).createPatch());
 		parent->addChildNode(cap);
 
 		Patch* capPatch = Node_getPatch(cap);
@@ -288,7 +288,7 @@ void createCaps(Patch& patch, const scene::INodePtr& parent, EPatchCap type, con
 	}
 
 	{
-		scene::INodePtr cap(GlobalPatchCreator(DEF2).createPatch());
+		scene::INodePtr cap(GlobalPatchCreator(PatchDefType::Def2).createPatch());
 		parent->addChildNode(cap);
 
 		Patch* capPatch = Node_getPatch(cap);

diff --git a/radiant/selection/algorithm/Primitives.cpp b/radiant/selection/algorithm/Primitives.cpp
@@ -243,7 +243,7 @@ class DecalPatchCreator
 			const Winding& winding = (*i)->getFace().getWinding();
 
 			// Create a new decal patch
-			scene::INodePtr patchNode = GlobalPatchCreator(DEF3).createPatch();
+			scene::INodePtr patchNode = GlobalPatchCreator(PatchDefType::Def3).createPatch();
 
 			if (patchNode == NULL) {
 				wxutil::Messagebox::ShowError(_("Could not create patch."));