Skip to content

Commit

Permalink
Fix warning
Browse files Browse the repository at this point in the history
  • Loading branch information
RainerKuemmerle committed Dec 21, 2017
1 parent fc664dc commit 32a0405
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions g2o/apps/g2o_simulator/simulator.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,25 @@ class G2O_SIMULATOR_API BaseRobot {
std::string _name;
};

class G2O_SIMULATOR_API World
{
public:
World(OptimizableGraph* graph_) {_graph = graph_; _runningId=0; _paramId=0;}
OptimizableGraph* graph() {return _graph;}
bool addRobot(BaseRobot* robot);
bool addWorldObject(BaseWorldObject* worldObject);
bool addParameter(Parameter* p);

std::set<BaseWorldObject*>& objects() {return _objects;}
std::set<BaseRobot*>& robots() {return _robots; }
protected:
std::set<BaseWorldObject*> _objects;
std::set<BaseRobot*> _robots;
OptimizableGraph* _graph;
int _runningId;
int _paramId;
};

template <class RobotPoseObject>
class Robot: public BaseRobot{
public:
Expand Down Expand Up @@ -272,25 +291,6 @@ class BinarySensor: public BaseSensor {
virtual void addNoise(EdgeType*){};
};

class G2O_SIMULATOR_API World
{
public:
World(OptimizableGraph* graph_) {_graph = graph_; _runningId=0; _paramId=0;}
OptimizableGraph* graph() {return _graph;}
bool addRobot(BaseRobot* robot);
bool addWorldObject(BaseWorldObject* worldObject);
bool addParameter(Parameter* p);

std::set<BaseWorldObject*>& objects() {return _objects;}
std::set<BaseRobot*>& robots() {return _robots; }
protected:
std::set<BaseWorldObject*> _objects;
std::set<BaseRobot*> _robots;
OptimizableGraph* _graph;
int _runningId;
int _paramId;
};

} // end namespace

#endif

0 comments on commit 32a0405

Please sign in to comment.