summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
diff options
context:
space:
mode:
authorMarkus Wick <markus@selfnet.de>2015-06-29 17:19:08 +0200
committerMarkus Wick <markus@selfnet.de>2015-06-29 17:19:08 +0200
commit134a18fdad7f963153c60c8d1a510e544c8d1777 (patch)
tree92f28fe862255d1f54ca62669d0d4f06cf3b790a /Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
parentc06342c3cf6b6695a4a2ec9e759ef1dd2cb66015 (diff)
parentdaa205990fa043092394931b85be6efdc37408df (diff)
Merge pull request #2674 from lioncash/emplace
Use emplace() instead of insert() where applicable for maps.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp')
-rw-r--r--Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
index 485cf54ee3..cdb7f75102 100644
--- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
@@ -258,7 +258,7 @@ ID3D11PixelShader* PSTextureEncoder::SetStaticShader(unsigned int dstFormat, PEC
dstFormat, srcFormat, isIntensity, scaleByHalf);
D3D::SetDebugObjectName(newShader, debugName);
- it = m_staticShaders.insert(std::make_pair(key, newShader)).first;
+ it = m_staticShaders.emplace(key, newShader).first;
bytecode->Release();
}