Merge pull request RobotLocomotion#5992 from jwnimmer-tri/build-unuse…

…d-parameter-framework Fix Wunused-parameter in framework
trigrass2 · May 1, 2017 · 3d5820e · 3d5820e
2 parents d997355 + f814eaf
commit 3d5820e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/drake/systems/framework/leaf_system.h b/drake/systems/framework/leaf_system.h
@@ -697,7 +697,8 @@ class LeafSystem : public System<T> {
   }
 
  private:
-  void DoGetPerStepEvents(const Context<T>& context,
+  void DoGetPerStepEvents(
+      const Context<T>&,
       std::vector<DiscreteEvent<T>>* events) const override {
     *events = per_step_events_;
   }

diff --git a/drake/systems/framework/system.h b/drake/systems/framework/system.h
@@ -1250,9 +1250,10 @@ class System {
   /// not null, and it can be changed freely by the overriding implementation.
   ///
   /// The default implementation returns without changing @p events.
-  virtual void DoGetPerStepEvents(const Context<T>& context,
+  virtual void DoGetPerStepEvents(
+      const Context<T>& context,
       std::vector<DiscreteEvent<T>>* events) const {
-    unused(context);
+    unused(context, events);
   }
 
   /// Override this method for physical systems to calculate the potential