Menu
▾
▴
[simspark-svn] SF.net SVN: simspark:[20] trunk/rcssserver3d
|
From: <he...@us...> - 2008-12-19 19:13:43
|
Revision: 20
http://simspark.svn.sourceforge.net/simspark/?rev=20&view=rev
Author: hedayat
Date: 2008-12-19 19:13:20 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
Replaced make_shared() function calls with .lock() function call, fixing a compilation problem with recent boost versoins.
Modified Paths:
--------------
trunk/rcssserver3d/ChangeLog
trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
Modified: trunk/rcssserver3d/ChangeLog
===================================================================
--- trunk/rcssserver3d/ChangeLog 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/ChangeLog 2008-12-19 19:13:20 UTC (rev 20)
@@ -0,0 +1,12 @@
+2008-12-19 Hedayat Vatankhah <he...@gr...>
+
+ * plugin/soccer/kickeffector/kickeffector.cpp:
+ * plugin/soccer/driveeffector/driveeffector.cpp:
+ * plugin/soccer/catcheffector/catcheffector.cpp:
+ * plugin/soccer/visionperceptor/visionperceptor.cpp:
+ * plugin/soccer/sayeffector/sayeffector.cpp:
+ * plugin/soccer/pantilteffector/pantilteffector.cpp:
+ * plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp:
+ * plugin/soccer/agentstateperceptor/agentstateperceptor.cpp:
+ - Replaced make_shared() with .lock() function call.(fixed compilation
+ error with recent boost versions.)
\ No newline at end of file
Modified: trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -61,7 +61,7 @@
predicate.parameter.Clear();
shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+ shared_dynamic_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/catcheffector/catcheffector.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -177,7 +177,7 @@
SoccerBase::GetSoccerRuleAspect(*this,mSoccerRule);
- mAgent = shared_dynamic_cast<AgentAspect>(make_shared(GetParent()));
+ mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/driveeffector/driveeffector.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -50,7 +50,7 @@
}
shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+ shared_dynamic_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/kickeffector/kickeffector.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -181,7 +181,7 @@
SoccerBase::GetBall(*this,mBall);
SoccerBase::GetBallBody(*this,mBallBody);
- mAgent = shared_dynamic_cast<AgentAspect>(make_shared(GetParent()));
+ mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/pantilteffector/pantilteffector.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -50,7 +50,7 @@
}
shared_ptr<BaseNode> parent =
- shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+ shared_dynamic_cast<BaseNode>(GetParent().lock());
if (parent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -155,7 +155,7 @@
SoccerBase::GetActiveScene(*this,mActiveScene);
shared_ptr<AgentAspect> agent_aspect =
- make_shared(FindParentSupportingClass<AgentAspect>());
+ FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect == 0)
{
GetLog()->Error()
@@ -164,7 +164,7 @@
else
{
mAgentAspect = agent_aspect;
- agent_aspect = make_shared(agent_aspect->FindParentSupportingClass<AgentAspect>());
+ agent_aspect = agent_aspect->FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect != 0)
{
mAgentAspect = agent_aspect;
@@ -236,12 +236,12 @@
od.mObj = shared_static_cast<ObjectState>(*i);
shared_ptr<BaseNode> node = shared_dynamic_cast<BaseNode>(mActiveScene);
- shared_ptr<AgentAspect> agent_aspect = make_shared(
- od.mObj->FindParentSupportingClass<AgentAspect>());
+ shared_ptr<AgentAspect> agent_aspect =
+ od.mObj->FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect != 0)
{
- shared_ptr<AgentAspect> aspect = make_shared(
- agent_aspect->FindParentSupportingClass<AgentAspect>());
+ shared_ptr<AgentAspect> aspect =
+ agent_aspect->FindParentSupportingClass<AgentAspect>().lock();
if (aspect != 0)
{
agent_aspect = aspect;
@@ -293,7 +293,7 @@
if (agent_aspect != 0)
{
shared_ptr<AgentAspect> aspect =
- make_shared(agent_aspect->FindParentSupportingClass<AgentAspect>());
+ agent_aspect->FindParentSupportingClass<AgentAspect>().lock();
if (aspect != 0)
{
agent_aspect = aspect;
Modified: trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/sayeffector/sayeffector.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -142,7 +142,7 @@
SoccerBase::GetAgentState(*this,mAgentState);
SoccerBase::GetSoccerRuleAspect(*this,mSoccerRule);
- mAgent = shared_dynamic_cast<AgentAspect>(make_shared(GetParent()));
+ mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
if (mAgent.get() == 0)
{
Modified: trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp
===================================================================
--- trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp 2008-12-19 18:12:56 UTC (rev 19)
+++ trunk/rcssserver3d/plugin/soccer/visionperceptor/visionperceptor.cpp 2008-12-19 19:13:20 UTC (rev 20)
@@ -77,7 +77,7 @@
SoccerBase::GetActiveScene(*this,mActiveScene);
shared_ptr<AgentAspect> agent_aspect =
- make_shared(FindParentSupportingClass<AgentAspect>());
+ FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect == 0)
{
GetLog()->Error()
@@ -86,7 +86,7 @@
else
{
mAgentAspect = agent_aspect;
- agent_aspect = make_shared(agent_aspect->FindParentSupportingClass<AgentAspect>());
+ agent_aspect = agent_aspect->FindParentSupportingClass<AgentAspect>().lock();
if (agent_aspect != 0)
{
mAgentAspect = agent_aspect;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
