Merge branch 'master' into bugfix/ompl_backward_compatibility

personalrobotics · Mar 19, 2017 · 41a5fbb · 41a5fbb
2 parents 45d023b + 3942ff7
commit 41a5fbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/aikido/constraint/InverseKinematicsSampleable.hpp b/include/aikido/constraint/InverseKinematicsSampleable.hpp
@@ -39,7 +39,7 @@ class InverseKinematicsSampleable : public Sampleable
   virtual ~InverseKinematicsSampleable() = default;
 
   // Documentation inherited.
-  virtual statespace::StateSpacePtr getStateSpace() const override;
+  statespace::StateSpacePtr getStateSpace() const override;
 
   // Documentation inherited.
   std::unique_ptr<SampleGenerator> createSampleGenerator() const override;

diff --git a/include/aikido/planner/ompl/CRRT.hpp b/include/aikido/planner/ompl/CRRT.hpp
@@ -53,7 +53,7 @@ class CRRT : public ::ompl::base::Planner
 
   /// Clear all internal datastructures. Planner settings are not affected.
   /// Subsequent calls to solve() will ignore all previous work.
-  virtual void clear(void) override;
+  void clear(void) override;
 
   /// Set the goal bias. In the process of randomly selecting states in the
   /// state space to attempt to go towards, the algorithm may in fact choose the