Update of /cvsroot/simspark/simspark/spark/oxygen/monitorserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5505
Modified Files:
Tag: WIN32
monitorserver.cpp monitorserver.h
Log Message:
- rename GetMonitorInfo() to GetMonitorData(). windows.h already #defines GetMonitorInfo
Index: monitorserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/monitorserver/monitorserver.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** monitorserver.h 5 Dec 2005 21:16:49 -0000 1.1
--- monitorserver.h 23 Feb 2007 19:22:57 -0000 1.1.2.1
***************
*** 64,68 ****
* done by the simulation engine
*/
! std::string GetMonitorInfo();
/** If a monitor sends information to the world model, this
--- 64,68 ----
* done by the simulation engine
*/
! std::string GetMonitorData();
/** If a monitor sends information to the world model, this
Index: monitorserver.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/monitorserver/monitorserver.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** monitorserver.cpp 5 Dec 2005 21:16:49 -0000 1.1
--- monitorserver.cpp 23 Feb 2007 19:22:54 -0000 1.1.2.1
***************
*** 162,166 ****
}
! string MonitorServer::GetMonitorInfo()
{
shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem();
--- 162,166 ----
}
! string MonitorServer::GetMonitorData()
{
shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem();
|
