Revision: 7889
http://playerstage.svn.sourceforge.net/playerstage/?rev=7889&view=rev
Author: rtv
Date: 2009-06-24 16:06:08 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
disambiguated calls to std::remove
Modified Paths:
--------------
code/stage/trunk/libstage/ancestor.cc
code/stage/trunk/libstage/model.cc
code/stage/trunk/libstage/stage.hh
code/stage/trunk/todo.txt
Modified: code/stage/trunk/libstage/ancestor.cc
===================================================================
--- code/stage/trunk/libstage/ancestor.cc 2009-06-24 13:25:20 UTC (rev
7888)
+++ code/stage/trunk/libstage/ancestor.cc 2009-06-24 16:06:08 UTC (rev
7889)
@@ -48,8 +48,7 @@
{
child_type_counts[mod->type]--;
- //children = g_list_remove( children, mod );
- children.erase( remove( children.begin(), children.end(), mod ) );
+ children.erase( std::remove( children.begin(), children.end(), mod ) );
}
Pose Ancestor::GetGlobalPose()
Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc 2009-06-24 13:25:20 UTC (rev 7888)
+++ code/stage/trunk/libstage/model.cc 2009-06-24 16:06:08 UTC (rev 7889)
@@ -278,7 +278,7 @@
// remove myself from my parent's child list, or the world's child
// list if I have no parent
std::vector<Model*>& vec = parent ? parent->children : world->children;
- vec.erase( remove( vec.begin(), vec.end(), this ));
+ vec.erase( std::remove( vec.begin(), vec.end(), this ));
if( callbacks ) g_hash_table_destroy( callbacks );
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2009-06-24 13:25:20 UTC (rev 7888)
+++ code/stage/trunk/libstage/stage.hh 2009-06-24 16:06:08 UTC (rev 7889)
@@ -2826,15 +2826,19 @@
virtual void DataVisualize( Camera* cam );
};
- // CAMERA MODEL ----------------------------------------------------
- typedef struct {
+
+// CAMERA MODEL ----------------------------------------------------
+
+/// %ModelCamera class
+class ModelCamera : public Model
+{
+public:
+ typedef struct
+ {
// GL_V3F
GLfloat x, y, z;
} ColoredVertex;
-
- /// %ModelCamera class
- class ModelCamera : public Model
- {
+
private:
Canvas* _canvas;
@@ -3053,9 +3057,7 @@
void GoTo( double pose );
double GetPosition() const {return pos;};
-
double GetMaxPosition() const {return max_position;};
-
double GetMinPosition() const {return min_position;};
};
Modified: code/stage/trunk/todo.txt
===================================================================
--- code/stage/trunk/todo.txt 2009-06-24 13:25:20 UTC (rev 7888)
+++ code/stage/trunk/todo.txt 2009-06-24 16:06:08 UTC (rev 7889)
@@ -9,8 +9,10 @@
** 3.1.0 RELEASE *
+ - visualizer option state in worldfile
- blinkenlights vs lightindicator - resolve and fix interfaces
- ranger transducer geometry correct?
+ - fix benchmark controller
- feature freeze around July 1
- scan SF for patches
- fix world files
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
