Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fixed compiler warnings when using Clang. #12

Merged
merged 1 commit into from Sep 23, 2011
Jump to file or symbol
Failed to load files and symbols.
+9 −13
Split
@@ -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;