Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

disambiguated calls to std::remove

  • Loading branch information...
commit 163bf23ca146c0ecf463523b47f0c453b9350858 1 parent 70cc772
rtv authored
View
3  libstage/ancestor.cc
@@ -48,8 +48,7 @@ void Ancestor::RemoveChild( Model* mod )
{
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()
View
2  libstage/model.cc
@@ -278,7 +278,7 @@ Model::~Model( void )
// 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 );
View
18 libstage/stage.hh
@@ -2826,15 +2826,19 @@ private:
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 @@ public:
void GoTo( double pose );
double GetPosition() const {return pos;};
-
double GetMaxPosition() const {return max_position;};
-
double GetMinPosition() const {return min_position;};
};
View
2  todo.txt
@@ -9,8 +9,10 @@ fasr.world 3600 seconds in 7.83 seconds (460 x real time)
** 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
Please sign in to comment.
Something went wrong with that request. Please try again.