rpms/rcssserver3d/devel rcssserver3d-0.6-boost.patch, NONE, 1.1 rcssserver3d.spec, 1.3, 1.4

Petr Machata pmachata at fedoraproject.org
Fri Dec 19 13:23:13 UTC 2008 

Author: pmachata

Update of /cvs/pkgs/rpms/rcssserver3d/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7324

Modified Files:
	rcssserver3d.spec 
Added Files:
	rcssserver3d-0.6-boost.patch 
Log Message:
- Rebuild for boost-1.37.0.
- Add patch to convert make_shared(X) to X.lock()


rcssserver3d-0.6-boost.patch:

--- NEW FILE rcssserver3d-0.6-boost.patch ---
diff -urp rcssserver3d-0.6/lib/oxygen/agentaspect/effector.cpp rcssserver3d-0.6-pm/lib/oxygen/agentaspect/effector.cpp
--- rcssserver3d-0.6/lib/oxygen/agentaspect/effector.cpp	2007-06-14 19:55:19.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/oxygen/agentaspect/effector.cpp	2008-12-19 14:04:17.000000000 +0100
@@ -30,7 +30,7 @@ shared_ptr<AgentAspect>
 Effector::GetAgentAspect()
 {
   return shared_static_cast<AgentAspect>
-    (make_shared(GetParentSupportingClass("AgentAspect")));
+    (GetParentSupportingClass("AgentAspect").lock());
 }
 
 bool Effector::Realize(boost::shared_ptr<ActionObject> action)
Only in rcssserver3d-0.6-pm/lib/oxygen/agentaspect: effector.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/agentaspect/jointeffector.h rcssserver3d-0.6-pm/lib/oxygen/agentaspect/jointeffector.h
--- rcssserver3d-0.6/lib/oxygen/agentaspect/jointeffector.h	2008-02-22 08:52:15.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/agentaspect/jointeffector.h	2008-12-19 14:04:38.000000000 +0100
@@ -42,7 +42,7 @@ public:
     virtual void UpdateCached()
     {
         Effector::UpdateCached();
-        mJoint = make_shared(FindParentSupportingClass<_JOINT>());
+        mJoint = FindParentSupportingClass<_JOINT>().lock();
 
         if (mJoint.get() == 0)
         {
Only in rcssserver3d-0.6-pm/lib/oxygen/agentaspect: jointeffector.h~
diff -urp rcssserver3d-0.6/lib/oxygen/agentaspect/jointperceptor.h rcssserver3d-0.6-pm/lib/oxygen/agentaspect/jointperceptor.h
--- rcssserver3d-0.6/lib/oxygen/agentaspect/jointperceptor.h	2008-02-22 08:52:15.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/agentaspect/jointperceptor.h	2008-12-19 14:03:58.000000000 +0100
@@ -40,7 +40,7 @@ public:
     virtual void UpdateCached()
     {
         Perceptor::UpdateCached();
-        mJoint = make_shared(FindParentSupportingClass<_JOINT>());
+        mJoint = FindParentSupportingClass<_JOINT>().lock();
 
         if (mJoint.get() == 0)
             {
Only in rcssserver3d-0.6-pm/lib/oxygen/agentaspect: jointperceptor.h~
diff -urp rcssserver3d-0.6/lib/oxygen/physicsserver/bodycontroller.cpp rcssserver3d-0.6-pm/lib/oxygen/physicsserver/bodycontroller.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/bodycontroller.cpp	2008-02-22 08:52:15.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/physicsserver/bodycontroller.cpp	2008-12-19 14:04:55.000000000 +0100
@@ -43,7 +43,7 @@ void BodyController::UpdateCached()
     mBody.reset();
 
     mBody = shared_dynamic_cast<Body>
-        (make_shared(GetParentSupportingClass("Body")));
+        (GetParentSupportingClass("Body").lock());
 
     if (mBody.get() == 0)
     {
Only in rcssserver3d-0.6-pm/lib/oxygen/physicsserver: bodycontroller.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/physicsserver/body.cpp rcssserver3d-0.6-pm/lib/oxygen/physicsserver/body.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/body.cpp	2008-03-24 18:21:08.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/physicsserver/body.cpp	2008-12-19 14:05:34.000000000 +0100
@@ -126,7 +126,7 @@ void Body::OnLink()
     dBodySetData(mODEBody, this);
 
     shared_ptr<BaseNode> baseNode = shared_static_cast<BaseNode>
-        (make_shared(GetParent()));
+        (GetParent().lock());
 
     const Matrix& mat = baseNode->GetWorldTransform();
     SetRotation(mat);
@@ -425,7 +425,7 @@ void Body::SynchronizeParent() const
     const dReal* rot = dBodyGetRotation(mODEBody);
 
     shared_ptr<BaseNode> baseNode = shared_static_cast<BaseNode>
-        (make_shared(GetParent()));
+        (GetParent().lock());
 
     
     Matrix mat;
@@ -513,7 +513,7 @@ shared_ptr<Body> Body::GetBody(dBodyID i
         }
 
     shared_ptr<Body> body = shared_static_cast<Body>
-        (make_shared(bodyPtr->GetSelf()));
+        (bodyPtr->GetSelf().lock());
 
     if (body.get() == 0)
         {
Only in rcssserver3d-0.6-pm/lib/oxygen/physicsserver: body.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/physicsserver/collider.cpp rcssserver3d-0.6-pm/lib/oxygen/physicsserver/collider.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/collider.cpp	2008-05-30 03:41:42.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/oxygen/physicsserver/collider.cpp	2008-12-19 14:05:07.000000000 +0100
@@ -194,7 +194,7 @@ shared_ptr<Collider> Collider::GetCollid
         }
 
     shared_ptr<Collider> collider = shared_static_cast<Collider>
-        (make_shared(collPtr->GetSelf()));
+        (collPtr->GetSelf().lock());
 
     if (collider.get() == 0)
         {
Only in rcssserver3d-0.6-pm/lib/oxygen/physicsserver: collider.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/physicsserver/collisionhandler.cpp rcssserver3d-0.6-pm/lib/oxygen/physicsserver/collisionhandler.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/collisionhandler.cpp	2008-02-22 08:52:14.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/physicsserver/collisionhandler.cpp	2008-12-19 14:05:52.000000000 +0100
@@ -69,7 +69,7 @@ CollisionHandler::UpdateCached()
                 << "(CollisionHandler) found no Space node\n";
         }
 
-    mCollider = shared_static_cast<Collider>(make_shared(GetParent()));
+    mCollider = shared_static_cast<Collider>(GetParent().lock());
     if (mCollider.get() == 0)
         {
             GetLog()->Debug()
Only in rcssserver3d-0.6-pm/lib/oxygen/physicsserver: collisionhandler.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/physicsserver/joint.cpp rcssserver3d-0.6-pm/lib/oxygen/physicsserver/joint.cpp
--- rcssserver3d-0.6/lib/oxygen/physicsserver/joint.cpp	2008-05-17 15:38:09.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/oxygen/physicsserver/joint.cpp	2008-12-19 14:06:12.000000000 +0100
@@ -66,7 +66,7 @@ shared_ptr<Joint> Joint::GetJoint(dJoint
         }
 
     shared_ptr<Joint> joint = shared_static_cast<Joint>
-        (make_shared(jointPtr->GetSelf()));
+        (jointPtr->GetSelf().lock());
 
     if (joint.get() == 0)
         {
@@ -126,7 +126,7 @@ shared_ptr<Body> Joint::GetBody(const st
         }
 
     shared_ptr<Leaf> mySelf = shared_static_cast<Leaf>
-        (make_shared(GetSelf()));
+        (GetSelf().lock());
 
     shared_ptr<Leaf> leaf = GetCore()->Get(path,mySelf);
 
Only in rcssserver3d-0.6-pm/lib/oxygen/physicsserver: joint.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/sceneserver/basenode.cpp rcssserver3d-0.6-pm/lib/oxygen/sceneserver/basenode.cpp
--- rcssserver3d-0.6/lib/oxygen/sceneserver/basenode.cpp	2008-05-28 16:22:01.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/oxygen/sceneserver/basenode.cpp	2008-12-19 14:03:29.000000000 +0100
@@ -153,7 +153,7 @@ shared_ptr<Scene> BaseNode::GetScene()
         }
 
     // move up the hierarchy until we find a scene node
-    return make_shared(FindParentSupportingClass<Scene>());
+    return FindParentSupportingClass<Scene>().lock();
 }
 
 void BaseNode::EnableDebugMode()
Only in rcssserver3d-0.6-pm/lib/oxygen/sceneserver: basenode.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/sceneserver/fpscontroller.cpp rcssserver3d-0.6-pm/lib/oxygen/sceneserver/fpscontroller.cpp
--- rcssserver3d-0.6/lib/oxygen/sceneserver/fpscontroller.cpp	2008-03-27 20:54:57.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/sceneserver/fpscontroller.cpp	2008-12-19 14:03:45.000000000 +0100
@@ -161,7 +161,7 @@ void FPSController::UpdateStatic(float d
     mBody->SetVelocity(velocity);
 
     shared_ptr<BaseNode> bodyParent = shared_static_cast<BaseNode>
-        (make_shared(mBody->GetParent()));
+        (mBody->GetParent().lock());
 
     if (bodyParent.get() != 0)
         {
Only in rcssserver3d-0.6-pm/lib/oxygen/sceneserver: fpscontroller.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/sceneserver/sceneserver.cpp rcssserver3d-0.6-pm/lib/oxygen/sceneserver/sceneserver.cpp
--- rcssserver3d-0.6/lib/oxygen/sceneserver/sceneserver.cpp	2008-02-27 18:57:16.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/sceneserver/sceneserver.cpp	2008-12-19 14:03:13.000000000 +0100
@@ -297,7 +297,7 @@ bool SceneServer::ImportScene(const stri
 void SceneServer::ReparentTransformChildren(shared_ptr<Transform> node)
 {
     shared_ptr<BaseNode> parent =
-        shared_dynamic_cast<BaseNode>(make_shared(node->GetParent()));
+        shared_dynamic_cast<BaseNode>(node->GetParent().lock());
 
     // while not empty
     while (node->begin() != node->end())
Only in rcssserver3d-0.6-pm/lib/oxygen/sceneserver: sceneserver.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/sceneserver/transform.cpp rcssserver3d-0.6-pm/lib/oxygen/sceneserver/transform.cpp
--- rcssserver3d-0.6/lib/oxygen/sceneserver/transform.cpp	2008-02-25 12:26:32.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/oxygen/sceneserver/transform.cpp	2008-12-19 14:02:46.000000000 +0100
@@ -66,7 +66,7 @@ void Transform::SetLocalTransform(const 
 void Transform::SetWorldTransform(const salt::Matrix &transform)
 {
     shared_ptr<BaseNode> parent = shared_static_cast<BaseNode>
-        (make_shared(mParent));
+        (mParent.lock());
 
     if (parent.get() == 0)
         {
@@ -122,7 +122,7 @@ void Transform::OnLink()
 
 void Transform::UpdateHierarchyInternal()
 {
-    shared_ptr<BaseNode> parent = shared_static_cast<BaseNode>(make_shared(mParent));
+    shared_ptr<BaseNode> parent = shared_static_cast<BaseNode>(mParent.lock());
 
     // no parent, return local transform
     if (parent.get() == NULL)
Only in rcssserver3d-0.6-pm/lib/oxygen/sceneserver: transform.cpp~
diff -urp rcssserver3d-0.6/lib/oxygen/simulationserver/simcontrolnode.cpp rcssserver3d-0.6-pm/lib/oxygen/simulationserver/simcontrolnode.cpp
--- rcssserver3d-0.6/lib/oxygen/simulationserver/simcontrolnode.cpp	2008-04-14 15:30:54.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/oxygen/simulationserver/simcontrolnode.cpp	2008-12-19 14:06:23.000000000 +0100
@@ -40,7 +40,7 @@ SimControlNode::~SimControlNode()
 shared_ptr<SimulationServer> SimControlNode::GetSimulationServer()
 {
     return shared_static_cast<SimulationServer>
-        (make_shared(GetParent()));
+        (GetParent().lock());
 }
 
 void SimControlNode::SetSimTime( float now )
Only in rcssserver3d-0.6-pm/lib/oxygen/simulationserver: simcontrolnode.cpp~
diff -urp rcssserver3d-0.6/lib/zeitgeist/class.cpp rcssserver3d-0.6-pm/lib/zeitgeist/class.cpp
--- rcssserver3d-0.6/lib/zeitgeist/class.cpp	2008-02-20 18:16:29.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/zeitgeist/class.cpp	2008-12-19 14:07:27.000000000 +0100
@@ -62,7 +62,7 @@ boost::shared_ptr<Object> Class::Create(
     if (obj.get())
     {
         if (obj->Construct(obj, shared_static_cast<Class>
-                           (make_shared(GetSelf()))) == true)
+                           (GetSelf().lock())) == true)
         {
             // successfully constructed
             AttachInstance(obj);
@@ -85,7 +85,7 @@ boost::shared_ptr<Core> Class::GetCore()
 
         }
 
-    return make_shared(mCore);
+    return mCore.lock();
 }
 
 void Class::AttachInstance(const boost::weak_ptr<Object> &instance)
Only in rcssserver3d-0.6-pm/lib/zeitgeist: class.cpp~
diff -urp rcssserver3d-0.6/lib/zeitgeist/core.cpp rcssserver3d-0.6-pm/lib/zeitgeist/core.cpp
--- rcssserver3d-0.6/lib/zeitgeist/core.cpp	2008-04-14 16:26:09.000000000 +0200
+++ rcssserver3d-0.6-pm/lib/zeitgeist/core.cpp	2008-12-19 14:06:45.000000000 +0100
@@ -232,7 +232,7 @@ void Core::Desctruct()
 
 boost::shared_ptr<CoreContext> Core::CreateContext()
 {
-    return shared_ptr<CoreContext>(new CoreContext(make_shared(mSelf), GetRoot()));
+    return shared_ptr<CoreContext>(new CoreContext(mSelf.lock(), GetRoot()));
 }
 
 boost::shared_ptr<Object>
Only in rcssserver3d-0.6-pm/lib/zeitgeist: core.cpp~
diff -urp rcssserver3d-0.6/lib/zeitgeist/leaf.cpp rcssserver3d-0.6-pm/lib/zeitgeist/leaf.cpp
--- rcssserver3d-0.6/lib/zeitgeist/leaf.cpp	2008-02-24 11:17:31.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/zeitgeist/leaf.cpp	2008-12-19 14:08:37.000000000 +0100
@@ -51,13 +51,13 @@ boost::shared_ptr<Leaf> Leaf::GetChild(c
 {
     if (name.compare("..") == 0)
     {
-        return make_shared(GetParent());
+        return GetParent().lock();
     }
 
     if (name.compare(".") == 0)
     {
 
-        return shared_static_cast<Leaf>(make_shared(GetSelf()));
+        return shared_static_cast<Leaf>(GetSelf().lock());
     }
 
     return boost::shared_ptr<Leaf>();
@@ -77,12 +77,12 @@ void Leaf::GetChildren(const std::string
 {
     if (name.compare("..") == 0)
     {
-        baseList.push_back(make_shared(GetParent()));
+        baseList.push_back(GetParent().lock());
     }
 
     if (name.compare(".") == 0)
     {
-        baseList.push_back(shared_static_cast<Leaf>(make_shared(GetSelf())));
+        baseList.push_back(shared_static_cast<Leaf>(GetSelf().lock()));
     }
 }
 
@@ -98,7 +98,7 @@ boost::weak_ptr<Node>
 Leaf::GetParentSupportingClass(const std::string &name) const
 {
   shared_ptr<Node> node
-    = shared_static_cast<Node>(make_shared(GetParent()));
+    = shared_static_cast<Node>(GetParent().lock());
 
   while
     (
@@ -107,7 +107,7 @@ Leaf::GetParentSupportingClass(const std
      (! node->GetClass()->SupportsClass(name))
      )
     {
-      node = make_shared(node->GetParent());
+      node = node->GetParent().lock();
     }
 
   return weak_ptr<Node>(node);
@@ -160,7 +160,7 @@ const std::string& Leaf::GetFullPath() c
         {
             if (p)
             {
-                shared_ptr<Leaf> blah = make_shared(GetParent());
+                shared_ptr<Leaf> blah = GetParent().lock();
                 parentPath = blah->GetFullPath();
             }
         }
Only in rcssserver3d-0.6-pm/lib/zeitgeist: leaf.cpp~
diff -urp rcssserver3d-0.6/lib/zeitgeist/node.cpp rcssserver3d-0.6-pm/lib/zeitgeist/node.cpp
--- rcssserver3d-0.6/lib/zeitgeist/node.cpp	2008-02-20 18:16:29.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/zeitgeist/node.cpp	2008-12-19 14:07:46.000000000 +0100
@@ -232,7 +232,7 @@ Node::AddChildReference(const boost::sha
     }
 
     mChildren.push_back(leaf);
-    leaf->SetParent(shared_static_cast<Node>(make_shared(GetSelf())));
+    leaf->SetParent(shared_static_cast<Node>(GetSelf().lock()));
     return true;
 }
 
Only in rcssserver3d-0.6-pm/lib/zeitgeist: node.cpp~
diff -urp rcssserver3d-0.6/lib/zeitgeist/node.h rcssserver3d-0.6-pm/lib/zeitgeist/node.h
--- rcssserver3d-0.6/lib/zeitgeist/node.h	2008-02-20 18:16:29.000000000 +0100
+++ rcssserver3d-0.6-pm/lib/zeitgeist/node.h	2008-12-19 13:58:00.000000000 +0100
@@ -132,7 +132,7 @@ boost::weak_ptr<CLASS>
 Leaf::FindParentSupportingClass() const
 {
     boost::shared_ptr<Node> node
-        = boost::shared_static_cast<Node>(make_shared(GetParent()));
+        = boost::shared_static_cast<Node>(GetParent().lock());
 
     while (node.get() != 0)
     {
Only in rcssserver3d-0.6-pm/lib/zeitgeist: node.h~
diff -urp rcssserver3d-0.6/plugin/forceeffector/forceeffector.cpp rcssserver3d-0.6-pm/plugin/forceeffector/forceeffector.cpp
--- rcssserver3d-0.6/plugin/forceeffector/forceeffector.cpp	2007-06-14 19:55:18.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/forceeffector/forceeffector.cpp	2008-12-19 14:02:05.000000000 +0100
@@ -83,7 +83,7 @@ ForceEffector::GetActionObject(const Pre
 void ForceEffector::OnLink()
 {
   shared_ptr<BaseNode> parent =
-    shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+    shared_dynamic_cast<BaseNode>(GetParent().lock());
 
   if (parent.get() == 0)
     {
Only in rcssserver3d-0.6-pm/plugin/forceeffector: forceeffector.cpp~
diff -urp rcssserver3d-0.6/plugin/perfectvisionperceptor/perfectvisionperceptor.cpp rcssserver3d-0.6-pm/plugin/perfectvisionperceptor/perfectvisionperceptor.cpp
--- rcssserver3d-0.6/plugin/perfectvisionperceptor/perfectvisionperceptor.cpp	2004-04-05 16:51:36.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/perfectvisionperceptor/perfectvisionperceptor.cpp	2008-12-19 14:02:27.000000000 +0100
@@ -71,7 +71,7 @@ PerfectVisionPerceptor::Percept(boost::s
 
     // we want positions relative to the closest parent transform node
     shared_ptr<Transform> parent = shared_dynamic_cast<Transform>
-        (make_shared(FindParentSupportingClass<Transform>()));
+        (FindParentSupportingClass<Transform>().lock());
 
     salt::Vector3f myPos(0,0,0);
     if (parent.get() == 0)
Only in rcssserver3d-0.6-pm/plugin/perfectvisionperceptor: perfectvisionperceptor.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp rcssserver3d-0.6-pm/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp
--- rcssserver3d-0.6/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp	2008-03-27 22:11:53.000000000 +0100
+++ rcssserver3d-0.6-pm/plugin/soccer/agentstateperceptor/agentstateperceptor.cpp	2008-12-19 14:01:05.000000000 +0100
@@ -61,7 +61,7 @@ AgentStatePerceptor::Percept(boost::shar
     predicate.parameter.Clear();
 
     shared_ptr<BaseNode> parent =
-        shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+        shared_dynamic_cast<BaseNode>(GetParent().lock());
 
     if (parent.get() == 0)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/agentstateperceptor: agentstateperceptor.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/catcheffector/catcheffector.cpp rcssserver3d-0.6-pm/plugin/soccer/catcheffector/catcheffector.cpp
--- rcssserver3d-0.6/plugin/soccer/catcheffector/catcheffector.cpp	2007-06-14 19:55:18.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/soccer/catcheffector/catcheffector.cpp	2008-12-19 14:01:07.000000000 +0100
@@ -177,7 +177,7 @@ CatchEffector::OnLink()
 
     SoccerBase::GetSoccerRuleAspect(*this,mSoccerRule);
 
-    mAgent = shared_dynamic_cast<AgentAspect>(make_shared(GetParent()));
+    mAgent = shared_dynamic_cast<AgentAspect>(GetParent().lock());
 
     if (mAgent.get() == 0)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/catcheffector: catcheffector.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/driveeffector/driveeffector.cpp rcssserver3d-0.6-pm/plugin/soccer/driveeffector/driveeffector.cpp
--- rcssserver3d-0.6/plugin/soccer/driveeffector/driveeffector.cpp	2008-02-22 17:48:18.000000000 +0100
+++ rcssserver3d-0.6-pm/plugin/soccer/driveeffector/driveeffector.cpp	2008-12-19 13:58:55.000000000 +0100
@@ -50,7 +50,7 @@ DriveEffector::Realize(boost::shared_ptr
     }
 
     shared_ptr<BaseNode> parent =
-        shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+        shared_dynamic_cast<BaseNode>(GetParent().lock());
 
     if (parent.get() == 0)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/driveeffector: driveeffector.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/kickeffector/kickeffector.cpp rcssserver3d-0.6-pm/plugin/soccer/kickeffector/kickeffector.cpp
--- rcssserver3d-0.6/plugin/soccer/kickeffector/kickeffector.cpp	2007-06-14 19:55:18.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/soccer/kickeffector/kickeffector.cpp	2008-12-19 14:01:06.000000000 +0100
@@ -181,7 +181,7 @@ KickEffector::OnLink()
     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)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/kickeffector: kickeffector.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/pantilteffector/pantilteffector.cpp rcssserver3d-0.6-pm/plugin/soccer/pantilteffector/pantilteffector.cpp
--- rcssserver3d-0.6/plugin/soccer/pantilteffector/pantilteffector.cpp	2008-03-27 22:11:53.000000000 +0100
+++ rcssserver3d-0.6-pm/plugin/soccer/pantilteffector/pantilteffector.cpp	2008-12-19 14:01:45.000000000 +0100
@@ -50,7 +50,7 @@ PanTiltEffector::PrePhysicsUpdateInterna
     }
 
     shared_ptr<BaseNode> parent =
-        shared_dynamic_cast<BaseNode>(make_shared(GetParent()));
+        shared_dynamic_cast<BaseNode>(GetParent().lock());
 
     if (parent.get() == 0)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/pantilteffector: pantilteffector.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp rcssserver3d-0.6-pm/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp
--- rcssserver3d-0.6/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2008-05-29 22:12:57.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/soccer/restrictedvisionperceptor/restrictedvisionperceptor.cpp	2008-12-19 13:59:54.000000000 +0100
@@ -155,7 +155,7 @@ RestrictedVisionPerceptor::OnLink()
     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 @@ RestrictedVisionPerceptor::OnLink()
     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 @@ RestrictedVisionPerceptor::SetupVisibleN
         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 @@ RestrictedVisionPerceptor::AddSense(Pred
     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;
Only in rcssserver3d-0.6-pm/plugin/soccer/restrictedvisionperceptor: restrictedvisionperceptor.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/sayeffector/sayeffector.cpp rcssserver3d-0.6-pm/plugin/soccer/sayeffector/sayeffector.cpp
--- rcssserver3d-0.6/plugin/soccer/sayeffector/sayeffector.cpp	2008-02-26 10:02:13.000000000 +0100
+++ rcssserver3d-0.6-pm/plugin/soccer/sayeffector/sayeffector.cpp	2008-12-19 14:01:31.000000000 +0100
@@ -142,7 +142,7 @@ SayEffector::OnLink()
     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)
     {
Only in rcssserver3d-0.6-pm/plugin/soccer/sayeffector: sayeffector.cpp~
diff -urp rcssserver3d-0.6/plugin/soccer/visionperceptor/visionperceptor.cpp rcssserver3d-0.6-pm/plugin/soccer/visionperceptor/visionperceptor.cpp
--- rcssserver3d-0.6/plugin/soccer/visionperceptor/visionperceptor.cpp	2008-06-06 09:56:16.000000000 +0200
+++ rcssserver3d-0.6-pm/plugin/soccer/visionperceptor/visionperceptor.cpp	2008-12-19 14:01:02.000000000 +0100
@@ -77,7 +77,7 @@ VisionPerceptor::OnLink()
     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 @@ VisionPerceptor::OnLink()
     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;
Only in rcssserver3d-0.6-pm/plugin/soccer/visionperceptor: visionperceptor.cpp~


Index: rcssserver3d.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rcssserver3d/devel/rcssserver3d.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rcssserver3d.spec	29 Sep 2008 19:32:13 -0000	1.3
+++ rcssserver3d.spec	19 Dec 2008 13:22:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rcssserver3d
 Version:        0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Robocup 3D Soccer Simulation Server
 
 Group:          Applications/System
@@ -14,6 +14,7 @@
 Source3:        %{name}-rsgedit.desktop
 Patch0:         %{name}-0.6-libnamefix.patch
 Patch1:         %{name}-0.6-odefix.patch
+Patch2:         %{name}-0.6-boost.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  automake autoconf gcc-c++ boost-devel slang-devel
@@ -83,6 +84,7 @@
 %setup -q
 %patch0 -p1 -b .libnamefix
 %patch1 -p1 -b .odefix
+%patch2 -p1 -b .boost
 autoreconf --install
 chmod a-x app/simspark/rsg/agent/nao/*
 find -name "*.cpp" -exec chmod a-x {} \;
@@ -166,6 +168,10 @@
 %endif
 
 %changelog
+* Fri Dec 19 2008 Petr Machata <pmachata at redhat.com> - 0.6-6
+- Rebuild for boost-1.37.0.
+- Add patch to convert make_shared(X) to X.lock()
+
 * Mon Sep 29 2008 Hedayat Vatankhah <hedayat at grad.com> 0.6-5
 - Rebuilding the package to use ODE 0.10.
 - Added dInitODE patch for physicsserver.cpp

More information about the fedora-extras-commits mailing list