From 68db615cd5f5ef731ca7018b251b43106c5a9f47 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Thu, 16 Nov 2017 19:38:10 -0800 Subject: Fixed Android build issues --- Graphics/GraphicsEngine/include/ResourceMappingImpl.h | 2 +- Graphics/GraphicsEngine/include/StateObjectsRegistry.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/include/ResourceMappingImpl.h b/Graphics/GraphicsEngine/include/ResourceMappingImpl.h index 39bc0f0a..0996144e 100644 --- a/Graphics/GraphicsEngine/include/ResourceMappingImpl.h +++ b/Graphics/GraphicsEngine/include/ResourceMappingImpl.h @@ -126,7 +126,7 @@ namespace Diligent ThreadingTools::LockHelper Lock(); ThreadingTools::LockFlag m_LockFlag; - typedef std::pair > HashTableElem; + typedef std::pair > HashTableElem; std::unordered_map< ResMappingHashKey, RefCntAutoPtr, std::hash, std::equal_to, STDAllocatorRawMem > m_HashTable; }; } diff --git a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h b/Graphics/GraphicsEngine/include/StateObjectsRegistry.h index 1a05ced7..febad5c6 100644 --- a/Graphics/GraphicsEngine/include/StateObjectsRegistry.h +++ b/Graphics/GraphicsEngine/include/StateObjectsRegistry.h @@ -198,7 +198,7 @@ namespace Diligent Atomics::AtomicLong m_NumDeletedObjects; /// Hash map that stores weak pointers to the referenced objects - typedef std::pair< ResourceDescType, RefCntWeakPtr > HashMapElem; + typedef std::pair< const ResourceDescType, RefCntWeakPtr > HashMapElem; std::unordered_map, std::hash, std::equal_to, STDAllocatorRawMem > m_DescToObjHashMap; /// Registry name used for debug output -- cgit v1.2.3