Skip to content

Commit

Permalink
Fix code review defects
Browse files Browse the repository at this point in the history
  • Loading branch information
jwnimmer-tri committed Aug 16, 2016
1 parent 5281dd5 commit 15720b5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions drake/systems/framework/basic_state_and_output_vector.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// For now, this is an empty .cc file that only serves to confirm
// basic_state_and_output_vector.h is a stand-alone header.

#include "drake/systems/framework/basic_state_and_output_vector.h"

// Catch compile errors early, by forcing an instantiation.
template class drake::systems::BasicStateAndOutputVector<double>;
4 changes: 2 additions & 2 deletions drake/systems/framework/basic_state_and_output_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace drake {
namespace systems {

/// BasicStateAndOutputVector is a concrete class template that implements
/// StateVector in a convenient manner for leaf Systems, and implements
/// StateVector in a convenient manner for LeafSystem blocks, and implements
/// VectorInterface so that it may also be used as an output.
///
/// @tparam T A mathematical type compatible with Eigen's Scalar.
Expand All @@ -33,7 +33,7 @@ class BasicStateAndOutputVector : public BasicStateVector<T>,
explicit BasicStateAndOutputVector(std::unique_ptr<VectorInterface<T>> vector)
: BasicStateVector<T>(std::move(vector)) {}

// N.B. The size() method overrides both BasicStateVector and VectorInterface.
// The size() method overrides both BasicStateVector and VectorInterface.
int size() const override { return this->get_wrapped_vector().size(); }

// These VectorInterface overrides merely delegate to the wrapped object.
Expand Down
4 changes: 2 additions & 2 deletions drake/systems/framework/basic_state_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ namespace drake {
namespace systems {

/// BasicStateVector is a concrete class template that implements
/// StateVector in a convenient manner for leaf Systems,
/// StateVector in a convenient manner for LeafSystem blocks,
/// by owning and wrapping a VectorInterface<T>.
///
/// It will often be convenient to inherit from BasicStateVector, and add
/// additional semantics specific to the leaf System. Such child classes must
/// additional semantics specific to the LeafSystem. Such child classes must
/// override DoClone with an implementation that returns their concrete type.
///
/// @tparam T A mathematical type compatible with Eigen's Scalar.
Expand Down

0 comments on commit 15720b5

Please sign in to comment.