From da50eacaad3fd0040118089304f2b8263de4102e Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 5 Jan 2016 18:08:16 -0800 Subject: [PATCH] Resolve Hash const function and include per Jenkins --- libraries/render-utils/src/DeferredLightingEffect.h | 4 ++-- libraries/render/src/render/Shape.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/render-utils/src/DeferredLightingEffect.h b/libraries/render-utils/src/DeferredLightingEffect.h index 40800258de..e0926fb5b8 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.h +++ b/libraries/render-utils/src/DeferredLightingEffect.h @@ -21,7 +21,7 @@ #include "model/Stage.h" #include "model/Geometry.h" -#include "render/Shape.h" +#include "ShapeRender.h" class RenderArgs; class SimpleProgramKey; @@ -32,7 +32,7 @@ class DeferredLightingEffect : public Dependency { SINGLETON_DEPENDENCY public: - static const int NORMAL_FITTING_MAP_SLOT = render::Shape::Slot::NORMAL_FITTING_MAP; + static const int NORMAL_FITTING_MAP_SLOT = ShapeRender::Slot::NORMAL_FITTING_MAP; static const int DEFERRED_TRANSFORM_BUFFER_SLOT = 2; void init(); diff --git a/libraries/render/src/render/Shape.h b/libraries/render/src/render/Shape.h index 917b27f2dc..8fc93d76af 100644 --- a/libraries/render/src/render/Shape.h +++ b/libraries/render/src/render/Shape.h @@ -87,7 +87,7 @@ public: // Hasher for use in unordered_maps class Hash { public: - size_t operator() (const ShapeKey& key) { + size_t operator() (const ShapeKey& key) const { return std::hash()(key._flags); } };