From f8b7db0bfe3269ab212a69d6ca19af2faf270ef3 Mon Sep 17 00:00:00 2001 From: ulukyn <ulukyn@gmail.com> Date: Tue, 10 Jan 2017 12:35:53 +0100 Subject: [PATCH] Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) --- code/ryzom/client/src/actions.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/actions.h b/code/ryzom/client/src/actions.h index 51499f43e..b177c1818 100644 --- a/code/ryzom/client/src/actions.h +++ b/code/ryzom/client/src/actions.h @@ -281,16 +281,16 @@ public: // HashMapTraits for NLMISC::TKey struct CTKeyHashMapTraits { - //enum { bucket_size = 4, min_buckets = 8, }; - //CTKeyHashMapTraits() { } + enum { bucket_size = 4, min_buckets = 8, }; + CTKeyHashMapTraits() { } size_t operator() (NLMISC::TKey key) const { - return static_cast<std::size_t>(key); + return (size_t)key; } - /*bool operator() (NLMISC::TKey key1, NLMISC::TKey key2) const + bool operator() (NLMISC::TKey key1, NLMISC::TKey key2) const { return key1 < key2; - }*/ + } }; /**