Skip to content

U
uniset2
Commit 2d3fd0c1 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(SharedMemory): переделал signal_history на более безопасное использование

и не менее эффективное "const HistoryInfo&" вместо указателя..
parent 1d7b633a
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
extensions/SharedMemory/SharedMemory.cc
View file @ 2d3fd0c1
......@@ -691,7 +691,7 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
m_historySignal.emit( &(*it) );
m_historySignal.emit( (*it) );
}
}
else if( s_it->second.type == UniversalIO::AI ||
......@@ -710,7 +710,7 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
m_historySignal.emit( &(*it) );
m_historySignal.emit( (*it) );
}
}
else
......@@ -721,7 +721,7 @@ void SharedMemory::updateHistory( IOStateList::iterator& s_it, IOController* )
it->fuse_sec = sm_tv_sec;
it->fuse_usec = sm_tv_usec;
m_historySignal.emit( &(*it) );
m_historySignal.emit( (*it) );
}
}
}
......
extensions/SharedMemory/SharedMemory.h
View file @ 2d3fd0c1
......@@ -343,8 +343,8 @@ class SharedMemory:
typedef std::list<History::iterator> HistoryItList;
typedef std::map<UniSetTypes::ObjectId,HistoryItList> HistoryFuseMap;
typedef sigc::signal<void,HistoryInfo*> HistorySlot;
HistorySlot signal_history(); /*!< сигнал о срабатывании условий "сборса" дампа истории */
typedef sigc::signal<void, const HistoryInfo&> HistorySlot;
HistorySlot signal_history(); /*!< сигнал о срабатывании условий "сброса" дампа истории */
inline int getHistoryStep(){ return histSaveTime; } /*!< период между точками "дампа", мсек */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment