Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
+3
-3
@@ -94,7 +94,7 @@ protected:
|
||||
float fDelayRemaining;
|
||||
};
|
||||
/** @brief The list of messages that are sent to a Screen. */
|
||||
vector<QueuedScreenMessage> m_QueuedMessages;
|
||||
std::vector<QueuedScreenMessage> m_QueuedMessages;
|
||||
static bool SortMessagesByDelayRemaining(const QueuedScreenMessage &m1, const QueuedScreenMessage &m2);
|
||||
|
||||
InputQueueCodeSet m_Codes;
|
||||
@@ -151,8 +151,8 @@ private:
|
||||
// void* is the key so that we can use lua_topointer to find the callback
|
||||
// to remove when removing a callback.
|
||||
typedef void const* callback_key_t;
|
||||
map<callback_key_t, LuaReference> m_InputCallbacks;
|
||||
vector<callback_key_t> m_DelayedCallbackRemovals;
|
||||
std::map<callback_key_t, LuaReference> m_InputCallbacks;
|
||||
std::vector<callback_key_t> m_DelayedCallbackRemovals;
|
||||
bool m_CallingInputCallbacks;
|
||||
void InternalRemoveCallback(callback_key_t key);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user