Permalink
Browse files

Merge pull request #12 from Rezzie/master

Fixed compiler warnings when using Clang.
  • Loading branch information...
2 parents 614449e + aadd1f6 commit 991c5d99cdbddddd2a75a191930db95a205f54c3 @rtv committed Sep 23, 2011
Showing with 9 additions and 13 deletions.
  1. +4 −10 examples/ctrl/astar/findpath.cpp
  2. +1 −1 libstage/ancestor.cc
  3. +2 −2 libstage/stage.hh
  4. +2 −0 libstageplugin/p_driver.h
@@ -27,16 +27,10 @@ static unsigned int _map_width=0, _map_height=0;
uint8_t GetMap( unsigned int x, unsigned int y )
{
assert(_map);
-
- if( x < 0 ||
- x >= _map_width ||
- y < 0 ||
- y >= _map_height
- )
- {
- return 9;
- }
-
+
+ if(x >= _map_width || y >= _map_height)
+ return 9;
+
return _map[(y*_map_width)+x];
}
View
@@ -56,7 +56,7 @@ void Ancestor::RemoveChild( Model* mod )
EraseAll( mod, children );
}
-Pose Ancestor::GetGlobalPose()
+Pose Ancestor::GetGlobalPose() const
{
Pose pose;
memset( &pose, 0, sizeof(pose));
View
@@ -714,8 +714,8 @@ namespace Stg
virtual void AddChild( Model* mod );
virtual void RemoveChild( Model* mod );
- virtual Pose GetGlobalPose();
-
+ virtual Pose GetGlobalPose() const;
+
const char* Token(){ return token.c_str(); }
const std::string& TokenStr(){ return token; }
@@ -108,6 +108,8 @@ class InterfaceModel
virtual void Subscribe( void );
virtual void Unsubscribe( void );
+ virtual void Subscribe( QueuePointer &queue );
+ virtual void Unsubscribe( QueuePointer &queue );
protected:
Stg::Model* mod;

0 comments on commit 991c5d9

Please sign in to comment.