seefoe/src
1
0
Fork 0
mirror of https://bitbucket.org/seefoe/src.git synced 2026-07-31 01:15:45 -04:00
Code Issues Projects Releases Wiki Activity

Removed references to tr1 now that c++11 works

Browse Source
This commit is contained in:
Anonymous
2014-01-23 09:28:13 -07:00
parent e6431a9fd4
commit 210bdb91d8
56 changed files with 198 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedMessageDispatch/src/shared/FirstSharedMessageDispatch.h
+1 -1
View File
@@ -16,7 +16,7 @@
#include "sharedMessageDispatch/Message.h"
#include "sharedMessageDispatch/Receiver.h"
#include <set>
#include <tr1/unordered_map>
#include <unordered_map>
// ======================================================================
engine/shared/library/sharedMessageDispatch/src/shared/MessageManager.cpp
+9 -9
View File
@@ -7,7 +7,7 @@
#include "sharedMessageDispatch/Receiver.h"
#include <set>
#include <tr1/unordered_map>
#include <unordered_map>
namespace MessageDispatch {
@@ -15,8 +15,8 @@ MessageManager MessageManager::ms_instance;
struct MessageManager::Data
{
std::tr1::unordered_map<unsigned long int, std::set<Receiver *> > receivers;
std::tr1::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> > staticCallbacks;
std::unordered_map<unsigned long int, std::set<Receiver *> > receivers;
std::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> > staticCallbacks;
};
//---------------------------------------------------------------------
@@ -72,7 +72,7 @@ void MessageManager::addReceiver(Receiver & target, const MessageBase & source)
void MessageManager::addReceiver(Receiver & target, const unsigned long int messageType)
{
std::tr1::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i = data->receivers.find(messageType);
std::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i = data->receivers.find(messageType);
if(i != data->receivers.end())
{
target.setHasTargets(true);
@@ -92,7 +92,7 @@ void MessageManager::addReceiver(Receiver & target, const unsigned long int mess
void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const MessageBase &), const unsigned long int messageType)
{
std::tr1::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> >::iterator f = data->staticCallbacks.find(messageType);
std::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> >::iterator f = data->staticCallbacks.find(messageType);
if(f != data->staticCallbacks.end())
{
std::set<void (*)(const Emitter &, const MessageBase &)> & targets = f->second;
@@ -121,7 +121,7 @@ void MessageManager::addStaticCallback(void (*callback)(const Emitter &, const M
void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & message) const
{
const unsigned long int messageType = message.getType();
std::tr1::unordered_map<unsigned long int, std::set<Receiver *> >::const_iterator i = data->receivers.find(messageType);
std::unordered_map<unsigned long int, std::set<Receiver *> >::const_iterator i = data->receivers.find(messageType);
if(i != data->receivers.end())
{
const std::set<Receiver *> targets = (*i).second;
@@ -136,7 +136,7 @@ void MessageManager::emitMessage(const Emitter & emitter, const MessageBase & me
}
}
std::tr1::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> >::iterator f = data->staticCallbacks.find(messageType);
std::unordered_map<unsigned long int, std::set<void (*)(const Emitter &, const MessageBase &)> >::iterator f = data->staticCallbacks.find(messageType);
if(f != data->staticCallbacks.end())
{
const std::set<void (*)(const Emitter &, const MessageBase &)> targets = f->second;
@@ -160,7 +160,7 @@ void MessageManager::receiverDestroyed(const Receiver & target)
return;
}
// find receiver
std::tr1::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i;
std::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i;
for(i = data->receivers.begin(); i != data->receivers.end(); ++i)
{
std::set<Receiver *> & targets = (*i).second;
@@ -200,7 +200,7 @@ void MessageManager::removeReceiver(const Receiver & target, const char * const
void MessageManager::removeReceiver(const Receiver & target, const unsigned long int messageType)
{
std::tr1::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i = data->receivers.find(messageType);
std::unordered_map<unsigned long int, std::set<Receiver *> >::iterator i = data->receivers.find(messageType);
if(i != data->receivers.end())
{
std::set<Receiver *> & targets = (*i).second;