33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From d117c71876fa8b02e8e85230e436681ce4527b2f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Kilian=20K=C3=B6ppchen?= <kiliankoeppchen@googlemail.com>
|
|
Date: Sat, 28 May 2016 12:27:04 +0200
|
|
Subject: [PATCH] Make code gcc6 compatible. Fix #887
|
|
|
|
removed the explicit provided type, so the compiler can deduce it by itself
|
|
---
|
|
engine/core/view/renderers/targetrenderer.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/engine/core/view/renderers/targetrenderer.cpp b/engine/core/view/renderers/targetrenderer.cpp
|
|
index 9f677fa..dd47b61 100644
|
|
--- a/engine/core/view/renderers/targetrenderer.cpp
|
|
+++ b/engine/core/view/renderers/targetrenderer.cpp
|
|
@@ -136,7 +136,7 @@ namespace FIFE {
|
|
rj.discard = false;
|
|
|
|
std::pair<RenderJobMap::iterator, bool> ret =
|
|
- m_targets.insert(std::make_pair<std::string, RenderJob>(name, rj));
|
|
+ m_targets.insert(std::make_pair(name, rj));
|
|
|
|
return ret.first->second.target;
|
|
}
|
|
@@ -149,7 +149,7 @@ namespace FIFE {
|
|
rj.discard = false;
|
|
|
|
std::pair<RenderJobMap::iterator, bool> ret =
|
|
- m_targets.insert(std::make_pair<std::string, RenderJob>(image->getName(), rj));
|
|
+ m_targets.insert(std::make_pair(image->getName(), rj));
|
|
|
|
return ret.first->second.target;
|
|
}
|