Selaa lähdekoodia

Fix std::hash being specialized outside of namespace std

Marc Legendre 9 vuotta sitten
vanhempi
sitoutus
f5a8d36faa

+ 4 - 1
Source/BansheeCore/Include/BsBlendState.h

@@ -243,15 +243,18 @@ namespace BansheeEngine
  *  @{
  */
 
+namespace std
+{
 /**	Hash value generator for BLEND_STATE_DESC. */
 template<>
-struct std::hash<BansheeEngine::BLEND_STATE_DESC>
+struct hash<BansheeEngine::BLEND_STATE_DESC>
 {
 	size_t operator()(const BansheeEngine::BLEND_STATE_DESC& value) const
 	{
 		return (size_t)BansheeEngine::BlendState::generateHash(value);
 	}
 };
+}
 
 /** @} */
 /** @endcond */

+ 5 - 2
Source/BansheeCore/Include/BsDepthStencilState.h

@@ -235,15 +235,18 @@ namespace BansheeEngine
  *  @{
  */
 
+namespace std
+{
 /**	Hash value generator for DEPTH_STENCIL_STATE_DESC. */
 template<>
-struct std::hash<BansheeEngine::DEPTH_STENCIL_STATE_DESC>
+struct hash<BansheeEngine::DEPTH_STENCIL_STATE_DESC>
 {
 	size_t operator()(const BansheeEngine::DEPTH_STENCIL_STATE_DESC& value) const
 	{
 		return (size_t)BansheeEngine::DepthStencilState::generateHash(value);
 	}
 };
+}
 
 /** @} */
-/** @endcond */
+/** @endcond */

+ 5 - 2
Source/BansheeCore/Include/BsRasterizerState.h

@@ -216,15 +216,18 @@ namespace BansheeEngine
  *  @{
  */
 
+namespace std
+{
 /**	Hash value generator for RASTERIZER_STATE_DESC. */
 template<>
-struct std::hash<BansheeEngine::RASTERIZER_STATE_DESC>
+struct hash<BansheeEngine::RASTERIZER_STATE_DESC>
 {
 	size_t operator()(const BansheeEngine::RASTERIZER_STATE_DESC& value) const
 	{
 		return (size_t)BansheeEngine::RasterizerState::generateHash(value);
 	}
 };
+}
 
 /** @} */
-/** @endcond */
+/** @endcond */

+ 5 - 2
Source/BansheeCore/Include/BsSamplerState.h

@@ -194,15 +194,18 @@ namespace BansheeEngine
  *  @{
  */
 
+namespace std
+{
 /**	Hash value generator for SAMPLER_STATE_DESC. */
 template<>
-struct std::hash<BansheeEngine::SAMPLER_STATE_DESC>
+struct hash<BansheeEngine::SAMPLER_STATE_DESC>
 {
 	size_t operator()(const BansheeEngine::SAMPLER_STATE_DESC& value) const
 	{
 		return (size_t)BansheeEngine::SamplerState::generateHash(value);
 	}
 };
+}
 
 /** @} */
-/** @endcond */
+/** @endcond */