Skip to content

Commit

Permalink
Fix result of bad merge conflict resolution.
Browse files Browse the repository at this point in the history
Refs #11056
  • Loading branch information
martyngigg committed Mar 9, 2016
1 parent 8ca81dc commit 374cb1a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Framework/DataObjects/test/MDBoxBaseTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ class MDBoxBaseTester : public MDBoxBase<MDE, nd> {
std::vector<MDE> *getEventsCopy() override { return NULL; }

/// Add a single event
size_t addEvent(const MDE & /*point*/) override {}
size_t addEvent(const MDE & /*point*/) override { return 0; }
/// Add a single event and trace it if the box it has been added may need
/// splitting
virtual void addAndTraceEvent(const MDE & /*point*/, size_t /*index */) {}

/// Add a single event
size_t addEventUnsafe(const MDE & /*point*/) override {}
size_t addEventUnsafe(const MDE & /*point*/) override { return 0; }
size_t
buildAndAddEvents(const std::vector<signal_t> & /*sigErrSq*/,
const std::vector<coord_t> & /*Coord*/,
Expand Down

0 comments on commit 374cb1a

Please sign in to comment.