[simspark-svn] SF.net SVN: simspark:[294] trunk

[<yx...@us...>]

Revision: 294
          http://simspark.svn.sourceforge.net/simspark/?rev=294&view=rev
Author:   yxu
Date:     2012-02-24 13:24:49 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
name conflicts in windows: GetMonitorInfo is a macro in WinUser.h

Modified Paths:
--------------
    trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp
    trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
    trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
    trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
    trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
    trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
    trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp
    trunk/spark/plugin/sparkmonitor/sparkmonitor.h

Modified: trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.cpp	2012-02-24 13:24:49 UTC (rev 294)
@@ -91,7 +91,7 @@
         }
 }
 
-string RCS3DMonitor::GetMonitorInfo(const PredicateList& pList)
+string RCS3DMonitor::GetMonitorInfomation(const PredicateList& pList)
 {
     stringstream ss;
     mFullState = false;

Modified: trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h	2012-02-24 13:24:49 UTC (rev 294)
@@ -82,7 +82,7 @@
      * the MonitorServer. The monitor should transfer them to the
      * client if possible.
      */
-    virtual std::string GetMonitorInfo(const oxygen::PredicateList& pList);
+    virtual std::string GetMonitorInfomation(const oxygen::PredicateList& pList);
 
     /** This function is called once for every MonitorSystem each time
      *  a new client connects. It should return any header/setup

Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.cpp	2012-02-24 13:24:49 UTC (rev 294)
@@ -213,7 +213,7 @@
 }
 
 string
-SexpMonitor::GetMonitorInfo(const oxygen::PredicateList& pList)
+SexpMonitor::GetMonitorInfomation(const oxygen::PredicateList& pList)
 {
     if (mGameState->IsFinished())
     {

Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2012-02-24 13:24:49 UTC (rev 294)
@@ -52,7 +52,7 @@
      * function is called to process it.
      * @param data data sent from monitor to monitorsystem via SPADES.
      */
-    void ParseMonitorMessage(const std::string& data);
+    virtual void ParseMonitorMessage(const std::string& data);
 
     /** This function will be called periodically to get information
      * about the current state of the world.
@@ -61,7 +61,7 @@
      * the MonitorServer. The monitor should transfer them to the
      * client if possible.
      */
-    virtual std::string GetMonitorInfo(const oxygen::PredicateList& pList);
+    virtual std::string GetMonitorInfomation(const oxygen::PredicateList& pList);
 
     /** This function is called once for every MonitorSystem each time
      *  a new client connects. It should return any header/setup

Modified: trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/spark/lib/oxygen/monitorserver/monitorserver.cpp	2012-02-24 13:24:49 UTC (rev 294)
@@ -193,7 +193,7 @@
 
     PredicateList pList;
     CollectItemPredicates(false,pList);
-    mData = monitorSystem->GetMonitorInfo(pList);
+    mData = monitorSystem->GetMonitorInfomation(pList);
     mDataCycle = cycle;
     return mData;
 }

Modified: trunk/spark/lib/oxygen/monitorserver/monitorsystem.h
===================================================================
--- trunk/spark/lib/oxygen/monitorserver/monitorsystem.h	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/spark/lib/oxygen/monitorserver/monitorsystem.h	2012-02-24 13:24:49 UTC (rev 294)
@@ -60,7 +60,7 @@
      * the MonitorServer. The monitor should transfer them to the
      * client if possible.
      */
-    virtual std::string GetMonitorInfo(const PredicateList& pList) = 0;
+    virtual std::string GetMonitorInfomation(const PredicateList& pList) = 0;
 
     /** If a monitor sends information to the world model, this
      * function is called to process it.

Modified: trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp
===================================================================
--- trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/spark/plugin/sparkmonitor/sparkmonitor.cpp	2012-02-24 13:24:49 UTC (rev 294)
@@ -91,7 +91,7 @@
         }
 }
 
-string SparkMonitor::GetMonitorInfo(const PredicateList& pList)
+string SparkMonitor::GetMonitorInfomation(const PredicateList& pList)
 {
     stringstream ss;
     mFullState = false;

Modified: trunk/spark/plugin/sparkmonitor/sparkmonitor.h
===================================================================
--- trunk/spark/plugin/sparkmonitor/sparkmonitor.h	2012-02-16 12:18:29 UTC (rev 293)
+++ trunk/spark/plugin/sparkmonitor/sparkmonitor.h	2012-02-24 13:24:49 UTC (rev 294)
@@ -80,7 +80,7 @@
      * the MonitorServer. The monitor should transfer them to the
      * client if possible.
      */
-    virtual std::string GetMonitorInfo(const oxygen::PredicateList& pList);
+    virtual std::string GetMonitorInfomation(const oxygen::PredicateList& pList);
 
     /** This function is called once for every MonitorSystem each time
      *  a new client connects. It should return any header/setup

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.