From cc96fcf243bbce2a4a8ae619ae7d8769274945c2 Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 9 Dec 2020 23:22:09 -0800 Subject: Fixed clang build errors --- AssetLoader/interface/GLTFResourceManager.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'AssetLoader/interface') diff --git a/AssetLoader/interface/GLTFResourceManager.hpp b/AssetLoader/interface/GLTFResourceManager.hpp index db386f1..bd3ea19 100644 --- a/AssetLoader/interface/GLTFResourceManager.hpp +++ b/AssetLoader/interface/GLTFResourceManager.hpp @@ -113,7 +113,7 @@ public: private: template - friend class MakeNewRCObj; + friend class Diligent::MakeNewRCObj; ResourceManager(IReferenceCounters* pRefCounters, IRenderDevice* pDevice, @@ -124,11 +124,13 @@ private: DynamicTextureAtlasCreateInfo m_DefaultAtlasDesc; const std::string m_DefaultAtlasName; - std::mutex m_AtlasesMtx; - std::unordered_map> m_Atlases; + using AtlasesHashMapType = std::unordered_map, std::hash>; + std::mutex m_AtlasesMtx; + AtlasesHashMapType m_Atlases; - std::mutex m_TexAllocationsMtx; - std::unordered_map> m_TexAllocations; + using TexAllocationsHashMapType = std::unordered_map>; + std::mutex m_TexAllocationsMtx; + TexAllocationsHashMapType m_TexAllocations; std::atomic_uint32_t m_ResourceVersion = {}; }; -- cgit v1.2.3