Previous 199869 Revisions Next

r31740 Friday 22nd August, 2014 at 17:06:19 UTC by Miodrag Milanović
(OSD BRANCH) Sync with latest changes (nw)
[/branches/osd/src/lib/bgfx/common/entry]cmd.cpp input.cpp

branches/osd/src/lib/bgfx/common/entry/input.cpp
r31739r31740
55
66#include <memory.h>
77#include <string>
8#include <unordered_map>
98
109#include "entry_p.h"
1110#include "input.h"
1211
12#include <tinystl/allocator.h>
13#include <tinystl/unordered_map.h>
14namespace stl = tinystl;
15
1316struct Mouse
1417{
1518   Mouse()
r31739r31740
112115
113116   void addBindings(const char* _name, const InputBinding* _bindings)
114117   {
115      m_inputBindingsMap.insert(std::make_pair(_name, _bindings) );
118      m_inputBindingsMap.insert(stl::make_pair(_name, _bindings) );
116119   }
117120
118121   void removeBindings(const char* _name)
119122   {
120      m_inputBindingsMap.erase(_name);
123      m_inputBindingsMap.erase(m_inputBindingsMap.find(_name));
121124   }
122125
123126   void process(const InputBinding* _bindings)
r31739r31740
169172      m_keyboard.reset();
170173   }
171174
172   typedef std::unordered_map<std::string, const InputBinding*> InputBindingMap;
175   typedef stl::unordered_map<const char*, const InputBinding*> InputBindingMap;
173176   InputBindingMap m_inputBindingsMap;
174177   Mouse m_mouse;
175178   Keyboard m_keyboard;
branches/osd/src/lib/bgfx/common/entry/cmd.cpp
r31739r31740
1313#include "dbg.h"
1414#include "cmd.h"
1515#include <string>
16#include <unordered_map>
16#include <tinystl/allocator.h>
17#include <tinystl/unordered_map.h>
18namespace stl = tinystl;
1719
1820struct CmdContext
1921{
r31739r31740
3032      uint32_t cmd = bx::hashMurmur2A(_name, (uint32_t)strlen(_name) );
3133      BX_CHECK(m_lookup.end() == m_lookup.find(cmd), "Command \"%s\" already exist.", _name);
3234      Func fn = { _fn, _userData };
33      m_lookup.insert(std::make_pair(cmd, fn) );
35      m_lookup.insert(stl::make_pair(cmd, fn) );
3436   }
3537
3638   void exec(const char* _cmd)
r31739r31740
8284      void* m_userData;
8385   };
8486
85   typedef std::unordered_map<uint32_t, Func> CmdLookup;
87   typedef stl::unordered_map<uint32_t, Func> CmdLookup;
8688   CmdLookup m_lookup;
8789};
8890

Previous 199869 Revisions Next


© 1997-2024 The MAME Team