[simspark-cvs] simspark/spark/oxygen/monitorserver monitorserver.cpp, 1.1, 1.2 monitorserver.h, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/oxygen/monitorserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7790/spark/oxygen/monitorserver

Modified Files:
	monitorserver.cpp monitorserver.h 
Log Message:
Merged WIN32 branch back to main trunk (access previous version with tag pre_merge_WIN32)

Index: monitorserver.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/monitorserver/monitorserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** monitorserver.h	5 Dec 2005 21:16:49 -0000	1.1
--- monitorserver.h	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 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.2
diff -C2 -d -r1.1 -r1.2
*** monitorserver.cpp	5 Dec 2005 21:16:49 -0000	1.1
--- monitorserver.cpp	15 Mar 2007 07:26:27 -0000	1.2
***************
*** 162,166 ****
  }
  
! string MonitorServer::GetMonitorInfo()
  {
      shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem();
--- 162,166 ----
  }
  
! string MonitorServer::GetMonitorData()
  {
      shared_ptr<MonitorSystem> monitorSystem = GetMonitorSystem();