Revision: 6454
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6454&view=rev
Author:   robotos
Date:     2008-05-23 07:29:35 -0700 (Fri, 23 May 2008)

Log Message:
-----------

Make them compile with GCC 4.3

Modified Paths:
--------------
    code/gazebo/trunk/server/GazeboMessage.cc
    code/gazebo/trunk/server/World.cc
    code/gazebo/trunk/server/XMLConfig.cc
    code/gazebo/trunk/server/main.cc
    code/gazebo/trunk/server/rendering/OgreSimpleShape.hh
    code/gazebo/trunk/server/rendering/OgreVisual.cc

Modified: code/gazebo/trunk/server/GazeboMessage.cc
===================================================================
--- code/gazebo/trunk/server/GazeboMessage.cc   2008-05-23 10:43:53 UTC (rev 
6453)
+++ code/gazebo/trunk/server/GazeboMessage.cc   2008-05-23 14:29:35 UTC (rev 
6454)
@@ -26,6 +26,7 @@
  */
 
 #include <time.h>
+#include <string.h>
 #include "XMLConfig.hh"
 #include "GazeboError.hh"
 #include "GazeboMessage.hh"

Modified: code/gazebo/trunk/server/World.cc
===================================================================
--- code/gazebo/trunk/server/World.cc   2008-05-23 10:43:53 UTC (rev 6453)
+++ code/gazebo/trunk/server/World.cc   2008-05-23 14:29:35 UTC (rev 6454)
@@ -83,7 +83,6 @@
     }
   }
   this->models.clear();
-
   this->geometries.clear();
 
   GZ_DELETE (this->physicsEngine)

Modified: code/gazebo/trunk/server/XMLConfig.cc
===================================================================
--- code/gazebo/trunk/server/XMLConfig.cc       2008-05-23 10:43:53 UTC (rev 
6453)
+++ code/gazebo/trunk/server/XMLConfig.cc       2008-05-23 14:29:35 UTC (rev 
6454)
@@ -27,9 +27,9 @@
 #include <assert.h>
 #include <float.h>
 #include <math.h>
+#include <string.h>
+#include <iostream>
 #include <sstream>
-#include <string>
-#include <iostream>
 
 #include <libxml/xinclude.h>
 #include <libxml/xpointer.h>

Modified: code/gazebo/trunk/server/main.cc
===================================================================
--- code/gazebo/trunk/server/main.cc    2008-05-23 10:43:53 UTC (rev 6453)
+++ code/gazebo/trunk/server/main.cc    2008-05-23 14:29:35 UTC (rev 6454)
@@ -101,6 +101,7 @@
 //#include <python2.4/Python.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
 #include <iostream>

Modified: code/gazebo/trunk/server/rendering/OgreSimpleShape.hh
===================================================================
--- code/gazebo/trunk/server/rendering/OgreSimpleShape.hh       2008-05-23 
10:43:53 UTC (rev 6453)
+++ code/gazebo/trunk/server/rendering/OgreSimpleShape.hh       2008-05-23 
14:29:35 UTC (rev 6454)
@@ -13,9 +13,6 @@
 /// \brief Class used to render simple shapes
 class OgreSimpleShape
 {
-  /// \brief The type of shape
-  public: typedef enum Shape {CUBE, ROUNDED_CUBE, CYLINDER, SPHERE};
-
   /// \brief Constructor
   private: OgreSimpleShape();
 

Modified: code/gazebo/trunk/server/rendering/OgreVisual.cc
===================================================================
--- code/gazebo/trunk/server/rendering/OgreVisual.cc    2008-05-23 10:43:53 UTC 
(rev 6453)
+++ code/gazebo/trunk/server/rendering/OgreVisual.cc    2008-05-23 14:29:35 UTC 
(rev 6454)
@@ -78,7 +78,6 @@
 
   this->xmlNode=node;
   std::string meshName = node->GetString("mesh","",1);
-  std::string materialName = node->GetString("material","",0);
 
   // Read the desired position and rotation of the mesh
   pose.pos = node->GetVector3("xyz", Vector3(0,0,0));


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

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to