diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-11-17 03:38:10 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-11-17 03:38:10 +0000 |
| commit | 68db615cd5f5ef731ca7018b251b43106c5a9f47 (patch) | |
| tree | cd135e3fde86ff21a0329cbb9ea84fc5394e4ca2 /Graphics/GraphicsEngine | |
| parent | Update readme.md (diff) | |
| download | DiligentCore-68db615cd5f5ef731ca7018b251b43106c5a9f47.tar.gz DiligentCore-68db615cd5f5ef731ca7018b251b43106c5a9f47.zip | |
Fixed Android build issues
Diffstat (limited to 'Graphics/GraphicsEngine')
| -rw-r--r-- | Graphics/GraphicsEngine/include/ResourceMappingImpl.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngine/include/StateObjectsRegistry.h | 2 |
2 files changed, 2 insertions, 2 deletions
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<ResMappingHashKey, RefCntAutoPtr<IDeviceObject> > HashTableElem; + typedef std::pair<const ResMappingHashKey, RefCntAutoPtr<IDeviceObject> > HashTableElem; std::unordered_map< ResMappingHashKey, RefCntAutoPtr<IDeviceObject>, std::hash<ResMappingHashKey>, std::equal_to<ResMappingHashKey>, STDAllocatorRawMem<HashTableElem> > 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<IDeviceObject> > HashMapElem; + typedef std::pair< const ResourceDescType, RefCntWeakPtr<IDeviceObject> > HashMapElem; std::unordered_map<ResourceDescType, RefCntWeakPtr<IDeviceObject>, std::hash<ResourceDescType>, std::equal_to<ResourceDescType>, STDAllocatorRawMem<HashMapElem> > m_DescToObjHashMap; /// Registry name used for debug output |