[Personalrobots-commit] SF.net SVN: personalrobots:[10847] pkg/trunk

[<stu...@us...>]

Revision: 10847
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=10847&view=rev
Author:   stuglaser
Date:     2009-02-09 21:41:50 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Removed all dependencies on stl_utils.

Modified Paths:
--------------
    pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
    pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp
    pkg/trunk/mechanism/hardware_interface/include/hardware_interface/hardware_interface.h
    pkg/trunk/mechanism/hardware_interface/manifest.xml
    pkg/trunk/mechanism/mechanism_model/include/mechanism_model/robot.h
    pkg/trunk/mechanism/mechanism_model/manifest.xml

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml	2009-02-09 21:41:50 UTC (rev 10847)
@@ -17,7 +17,6 @@
   <depend package="std_msgs" />
   <depend package="pr2_msgs" />
   <depend package="robot_msgs" />
-  <depend package="stl_utils" />
   <depend package="angles" />
   <depend package="transformations" />  
   <depend package="gazebo_robot_description"/>

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp	2009-02-09 21:41:50 UTC (rev 10847)
@@ -33,7 +33,6 @@
 #include <math.h>
 #include <unistd.h>
 #include <set>
-#include <stl_utils/stl_utils.h>
 #include <gazebo/Global.hh>
 #include <gazebo/XMLConfig.hh>
 #include <gazebo/Model.hh>

Modified: pkg/trunk/mechanism/hardware_interface/include/hardware_interface/hardware_interface.h
===================================================================
--- pkg/trunk/mechanism/hardware_interface/include/hardware_interface/hardware_interface.h	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/mechanism/hardware_interface/include/hardware_interface/hardware_interface.h	2009-02-09 21:41:50 UTC (rev 10847)
@@ -37,8 +37,23 @@
 
 #include <string>
 #include <vector>
-#include <stl_utils/stl_utils.h>
 
+// See http://prdev.willowgarage.com/trac/personalrobots/ticket/883
+template <class C>
+void deleteElements(C *c)
+{
+  typename C::iterator it;
+  for (it = c->begin(); it != c->end(); ++it)
+  {
+    if (*it != NULL)
+    {
+      delete (*it);
+      *it = NULL;
+    }
+  }
+}
+
+
 class ActuatorState{
 public:
   ActuatorState() :

Modified: pkg/trunk/mechanism/hardware_interface/manifest.xml
===================================================================
--- pkg/trunk/mechanism/hardware_interface/manifest.xml	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/mechanism/hardware_interface/manifest.xml	2009-02-09 21:41:50 UTC (rev 10847)
@@ -5,7 +5,6 @@
 <license>BSD</license>
 <review status="unreviewed" notes="API review in progress (Eric)"/>
 <url>http://pr.willowgarage.com</url>
-<depend package="stl_utils" />
 <export>
   <cpp cflags="-I${prefix}/include"/>
 </export>

Modified: pkg/trunk/mechanism/mechanism_model/include/mechanism_model/robot.h
===================================================================
--- pkg/trunk/mechanism/mechanism_model/include/mechanism_model/robot.h	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/mechanism/mechanism_model/include/mechanism_model/robot.h	2009-02-09 21:41:50 UTC (rev 10847)
@@ -36,9 +36,9 @@
  * The robot model tracks the state of the robot.
  *
  * State path:
- *               +---------------+                
+ *               +---------------+
  * Actuators --> | Transmissions | --> Joints --> Links
- *               +---------------+                
+ *               +---------------+
  *
  * Author: Stuart Glaser
  */
@@ -49,7 +49,6 @@
 #include <vector>
 #include <map>
 #include <string>
-#include "stl_utils/stl_utils.h"
 #include "mechanism_model/link.h"
 #include "mechanism_model/joint.h"
 #include "mechanism_model/transmission.h"
@@ -110,7 +109,7 @@
   * Each transmission refers to the actuators and joints it connects by name.
   * Since name lookup is slow, for each transmission in the robot model we
   * cache pointers to the actuators and joints that it connects.
-  **/ 
+  **/
   std::vector<std::vector<Actuator*> > transmissions_in_;
   std::vector<std::vector<JointState*> > transmissions_out_;
 

Modified: pkg/trunk/mechanism/mechanism_model/manifest.xml
===================================================================
--- pkg/trunk/mechanism/mechanism_model/manifest.xml	2009-02-09 21:37:38 UTC (rev 10846)
+++ pkg/trunk/mechanism/mechanism_model/manifest.xml	2009-02-09 21:41:50 UTC (rev 10847)
@@ -6,7 +6,6 @@
 <review status="unreviewed" notes="API review in progress (Eric)"/>
 <depend package="roscpp" />
 <depend package="hardware_interface" />
-<depend package="stl_utils" />
 <depend package="loki" />
 <depend package="tinyxml" />
 <depend package="wg_robot_description_parser" />


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