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

[<jfa...@us...>]

Revision: 5923
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=5923&view=rev
Author:   jfaustwg
Date:     2008-10-29 18:28:23 +0000 (Wed, 29 Oct 2008)

Log Message:
-----------
 r10969@lan-dhcp-121:  jfaust | 2008-10-28 13:56:49 -0700
 Fixed warnings brought on by adding the __printf__ attribute in rosconsole

Modified Paths:
--------------
    pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property.h
    pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.cpp
    pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.h
    pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/visualization_manager.cpp

Property Changed:
----------------
    pkg/trunk/


Property changes on: pkg/trunk
___________________________________________________________________
Modified: svk:merge
   - 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:10894
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261
   + 920d6130-5740-4ec1-bb1a-45963d5fd813:/frameidpr:7015
920d6130-5740-4ec1-bb1a-45963d5fd813:/users/josh-pr:10969
920d6130-5740-4ec1-bb1a-45963d5fd813:/wgpkgtrunk:5865
f5854215-dd47-0410-b2c4-cdd35faa7885:/pkg/branches/rosbus:261

Modified: pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property.h
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property.h	2008-10-29 18:22:01 UTC (rev 5922)
+++ pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property.h	2008-10-29 18:28:23 UTC (rev 5923)
@@ -126,8 +126,8 @@
    */
   virtual ~Property()
   {
-    PROPERTY_DEBUG("Property Destructor: 0x%08x, %s%s", this, (const char*)prefix_.mb_str(), (const char*)name_.mb_str());
-    PROPERTY_DEBUG("Deleting wxPGProperty: 0x%08x", property_);
+    PROPERTY_DEBUG("Property Destructor: 0x%08x, %s%s", (int)this, (const char*)prefix_.mb_str(), (const char*)name_.mb_str());
+    PROPERTY_DEBUG("Deleting wxPGProperty: 0x%08x", (int)property_);
     grid_->DeleteProperty( property_ );
   }
 

Modified: pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.cpp
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.cpp	2008-10-29 18:22:01 UTC (rev 5922)
+++ pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.cpp	2008-10-29 18:28:23 UTC (rev 5923)
@@ -75,7 +75,7 @@
     return;
   }
 
-  PROPERTY_DEBUG("PropertyManager::deleteProperty( PropertyBase* property ): 0x%08x, %s%s", property, property->getPrefix().c_str(), property->getName().c_str());
+  PROPERTY_DEBUG("PropertyManager::deleteProperty( PropertyBase* property ): 0x%08x, %s%s", (int)property, property->getPrefix().c_str(), property->getName().c_str());
 
   deleteProperty( property->getName(), property->getPrefix() );
 }
@@ -115,7 +115,7 @@
 
 void PropertyManager::deleteByUserData( void* user_data )
 {
-  PROPERTY_DEBUG("PropertyManager::deleteByUserData: user_data=0x%08x", user_data);
+  PROPERTY_DEBUG("PropertyManager::deleteByUserData: user_data=0x%08x", (int)user_data);
 
   std::set<PropertyBase*> to_delete;
 

Modified: pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.h
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.h	2008-10-29 18:22:01 UTC (rev 5922)
+++ pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/properties/property_manager.h	2008-10-29 18:28:23 UTC (rev 5923)
@@ -79,7 +79,7 @@
     std::pair<M_Property::iterator, bool> pib = properties_.insert( std::make_pair( std::make_pair(prefix, name), property ) );
     ROS_ASSERT(pib.second);
 
-    PROPERTY_DEBUG("PropertyManager::createProperty: Inserted property 0x%08x, %s%s", property, pib.first->first.first.c_str(), pib.first->first.second.c_str());
+    PROPERTY_DEBUG("PropertyManager::createProperty: Inserted property 0x%08x, %s%s", (int)property, pib.first->first.first.c_str(), pib.first->first.second.c_str());
 
     property->writeToGrid();
     property->setPGClientData();

Modified: pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/visualization_manager.cpp
===================================================================
--- pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/visualization_manager.cpp	2008-10-29 18:22:01 UTC (rev 5922)
+++ pkg/trunk/visualization/ogre_visualizer/src/ogre_visualizer/visualization_manager.cpp	2008-10-29 18:28:23 UTC (rev 5923)
@@ -558,7 +558,7 @@
   }
   catch(tf::TransformException& e)
   {
-    ROS_ERROR( "Error transforming from frame '%s' to frame '%s': %s\n", target_frame_.c_str(), fixed_frame_.c_str() );
+    ROS_ERROR( "Error transforming from frame '%s' to frame '%s'\n", target_frame_.c_str(), fixed_frame_.c_str() );
   }
 
   Ogre::Vector3 position = Ogre::Vector3( pose.getOrigin().x(), pose.getOrigin().y(), pose.getOrigin().z() );


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