From 8a6db042defbe27d1281edc6f2ac6e1817940d09 Mon Sep 17 00:00:00 2001 From: Tigran Gasparian Date: Wed, 4 Jul 2018 14:25:48 +0200 Subject: [PATCH] Removes int initializer in SharedMemoryUserDataHashKey, changes '>>' into '> >' for nexted templates. --- examples/SharedMemory/PhysicsServerCommandProcessor.cpp | 2 +- examples/SharedMemory/SharedMemoryUserData.h | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp index 502d757f5..6284451d1 100644 --- a/examples/SharedMemory/PhysicsServerCommandProcessor.cpp +++ b/examples/SharedMemory/PhysicsServerCommandProcessor.cpp @@ -1538,7 +1538,7 @@ struct PhysicsServerCommandProcessorInternalData b3ResizablePool< InternalBodyHandle > m_bodyHandles; b3ResizablePool m_userCollisionShapeHandles; b3ResizablePool m_userVisualShapeHandles; - b3ResizablePool> m_userDataHandles; + b3ResizablePool > m_userDataHandles; btHashMap m_userDataHandleLookup; b3PluginManager m_pluginManager; diff --git a/examples/SharedMemory/SharedMemoryUserData.h b/examples/SharedMemory/SharedMemoryUserData.h index 991714557..aabc48bff 100644 --- a/examples/SharedMemory/SharedMemoryUserData.h +++ b/examples/SharedMemory/SharedMemoryUserData.h @@ -48,15 +48,14 @@ struct SharedMemoryUserData } }; -class SharedMemoryUserDataHashKey { - unsigned int m_hash = 0; +struct SharedMemoryUserDataHashKey { + unsigned int m_hash; btHashString m_key; btHashInt m_bodyUniqueId; btHashInt m_linkIndex; btHashInt m_visualShapeIndex; -public: SIMD_FORCE_INLINE unsigned int getHash()const { return m_hash; }