Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/yacs
[modules/yacs.git]
/
src
/
engine
/
Dispatcher.cxx
diff --git
a/src/engine/Dispatcher.cxx
b/src/engine/Dispatcher.cxx
index 8ca796b751824cff41ebac4c01b29a5a84002246..95afd669d666ab24965db48ba14f85ebc02ed859 100644
(file)
--- a/
src/engine/Dispatcher.cxx
+++ b/
src/engine/Dispatcher.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2006-201
6
CEA/DEN, EDF R&D
+// Copyright (C) 2006-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-80,11
+80,11
@@
void Dispatcher::printObservers()
void Dispatcher::dispatch(Node* object, const std::string& event)
{
DEBTRACE("Dispatcher::dispatch " << event );
void Dispatcher::dispatch(Node* object, const std::string& event)
{
DEBTRACE("Dispatcher::dispatch " << event );
- typedef std::set<Observer*>::iterator jt;
std::pair<Node*,std::string> key(object,event);
std::pair<Node*,std::string> key(object,event);
- if(_observers.count(key) != 0)
+ std::map< std::pair<Node*,std::string> , std::set<Observer*> >::const_iterator it(_observers.find(key));
+ if(it!=_observers.end())
{
{
- for(
jt iter=_observers[key].begin();iter!=_observers[key]
.end();iter++)
+ for(
std::set<Observer*>::const_iterator iter=(*it).second.begin();iter!=(*it).second
.end();iter++)
{
(*iter)->notifyObserver(object,event);
}
{
(*iter)->notifyObserver(object,event);
}
@@
-93,11
+93,11
@@
void Dispatcher::dispatch(Node* object, const std::string& event)
void Dispatcher::dispatch2(Node* object,const std::string& event, void *something)
{
void Dispatcher::dispatch2(Node* object,const std::string& event, void *something)
{
- typedef std::set<Observer*>::iterator jt;
std::pair<Node*,std::string> key(object,event);
std::pair<Node*,std::string> key(object,event);
- if(_observers.count(key) != 0)
+ std::map< std::pair<Node*,std::string> , std::set<Observer*> >::const_iterator it(_observers.find(key));
+ if(it!=_observers.end())
{
{
- for(
jt iter=_observers[key].begin();iter!=_observers[key]
.end();iter++)
+ for(
std::set<Observer*>::const_iterator iter=(*it).second.begin();iter!=(*it).second
.end();iter++)
{
(*iter)->notifyObserver2(object,event,something);
}
{
(*iter)->notifyObserver2(object,event,something);
}