mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #683 from Nodrev/bugfix-inputbinding-hash

Browse Source 
Using char* as key for unordered_map can lead to unexpected behavior …
This commit is contained in:
Branimir Karadžić 2016-02-16 12:30:09 -08:00
commit 40ca8eb8ad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/common/entry/input.cpp
View File

@ -11,6 +11,7 @@
#include <bx/allocator.h> #include <bx/allocator.h>
#include <bx/ringbuffer.h> #include <bx/ringbuffer.h>
#include <tinystl/string.h>
#include <tinystl/allocator.h> #include <tinystl/allocator.h>
#include <tinystl/unordered_map.h> #include <tinystl/unordered_map.h>
namespace stl = tinystl; namespace stl = tinystl;
@ -197,12 +198,12 @@ struct Input
void addBindings(const char* _name, const InputBinding* _bindings) void addBindings(const char* _name, const InputBinding* _bindings)
{ {
m_inputBindingsMap.insert(stl::make_pair(_name, _bindings) ); m_inputBindingsMap.insert(stl::make_pair(stl::string(_name), _bindings) );
} }
void removeBindings(const char* _name) void removeBindings(const char* _name)
{ {
InputBindingMap::iterator it = m_inputBindingsMap.find(_name); InputBindingMap::iterator it = m_inputBindingsMap.find(stl::string(_name));
if (it != m_inputBindingsMap.end() ) if (it != m_inputBindingsMap.end() )
{ {
m_inputBindingsMap.erase(it); m_inputBindingsMap.erase(it);
@ -275,7 +276,7 @@ struct Input
} }
} }
typedef stl::unordered_map<const char*, const InputBinding*> InputBindingMap; typedef stl::unordered_map<stl::string, const InputBinding*> InputBindingMap;
InputBindingMap m_inputBindingsMap; InputBindingMap m_inputBindingsMap;
Mouse m_mouse; Mouse m_mouse;
Keyboard m_keyboard; Keyboard m_keyboard;