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

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

Revision: 231
          http://simspark.svn.sourceforge.net/simspark/?rev=231&view=rev
Author:   yxu
Date:     2010-12-16 11:27:45 +0000 (Thu, 16 Dec 2010)

Log Message:
-----------
compile by VC10

Modified Paths:
--------------
    trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
    trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
    trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp

Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2010-12-16 11:27:19 UTC (rev 230)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2010-12-16 11:27:45 UTC (rev 231)
@@ -26,7 +26,6 @@
 #include <soccerbase/soccerbase.h>
 #include <salt/gmath.h>
 #include <list>
-#include <X11/X.h>
 #include <math.h>
 #include <salt/linesegment2.h>
 #include <limits>

Modified: trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp	2010-12-16 11:27:19 UTC (rev 230)
+++ trunk/rcssserver3d/plugin/soccer/trainercommandparser/trainercommandparser.cpp	2010-12-16 11:27:45 UTC (rev 231)
@@ -508,7 +508,7 @@
     int                 unum;
     bool specified = true;
     
-    shared_ptr<SoccerRuleAspect> soccerRuleAspect;
+    boost::shared_ptr<SoccerRuleAspect> soccerRuleAspect;
     if (!SoccerBase::GetSoccerRuleAspect(*this, soccerRuleAspect))
     {
         GetLog()->Error() << "(TrainerCommandParser) ERROR: can't get soccer rule aspect\n";
@@ -582,7 +582,7 @@
     int                 unum;
     bool specified = true;
     
-    shared_ptr<SoccerRuleAspect> soccerRuleAspect;
+    boost::shared_ptr<SoccerRuleAspect> soccerRuleAspect;
     if (!SoccerBase::GetSoccerRuleAspect(*this, soccerRuleAspect))
     {
         GetLog()->Error() << "(TrainerCommandParser) ERROR: can't get soccer rule aspect\n";
@@ -643,7 +643,7 @@
     int                 unum;
     bool specified = true;
     
-    shared_ptr<SoccerRuleAspect> soccerRuleAspect;
+    boost::shared_ptr<SoccerRuleAspect> soccerRuleAspect;
     if (!SoccerBase::GetSoccerRuleAspect(*this, soccerRuleAspect))
     {
         GetLog()->Error() << "(TrainerCommandParser) ERROR: can't get soccer rule aspect\n";

Modified: trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp
===================================================================
--- trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp	2010-12-16 11:27:19 UTC (rev 230)
+++ trunk/spark/lib/oxygen/proxyserver/agentproxy.cpp	2010-12-16 11:27:45 UTC (rev 231)
@@ -23,7 +23,7 @@
 #include <rcssnet/exception.hpp>
 #include <zeitgeist/logserver/logserver.h>
 #include <oxygen/simulationserver/netcontrol.h>
-
+#include <errno.h>
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -32,7 +32,6 @@
 using namespace zeitgeist;
 using namespace std;
 using namespace rcss::net;
-using boost::shared_ptr;
 
 AgentProxy::AgentProxy(int cycleMillisecs) : Node(),
     mCycleMillisecs(cycleMillisecs), mFinished(false),
@@ -69,7 +68,7 @@
         mNetMessage = FindChildSupportingClass<NetMessage>();
         if (mNetMessage.get() == 0)
         {
-            mNetMessage = shared_ptr<NetMessage>(new NetMessage());
+            mNetMessage = boost::shared_ptr<NetMessage>(new NetMessage());
         }
 
         mAgentConnectionThread = boost::thread(
@@ -107,7 +106,7 @@
     string servermsg, agentmsg;
     boost::system_time cycleFinishTime = boost::get_system_time()
             + boost::posix_time::milliseconds(mCycleMillisecs);
-    shared_ptr<NetBuffer> netbuf(new NetBuffer);
+    boost::shared_ptr<NetBuffer> netbuf(new NetBuffer);
     TRawBuffer recvbuf;
 
     mNetMessage->PrepareToSend(syncMsg);


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