Resolve Hash const function and include per Jenkins

This commit is contained in:
Zach Pomerantz 2016-01-05 18:08:16 -08:00
parent 948dc26d24
commit da50eacaad
2 changed files with 3 additions and 3 deletions

View file

@ -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();

View file

@ -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<ShapeKey::Flags>()(key._flags);
}
};