#1941: remove getGlobalEpoch

DARMA-tasking · Sep 28, 2022 · 79c9511 · 79c9511
1 parent cf747c8
commit 79c9511
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc
@@ -173,7 +173,7 @@ void ActiveMessenger::startup() {
 #endif
 }
 
-/*virtual*/ ActiveMessenger::~ActiveMessenger() {};
+/*virtual*/ ActiveMessenger::~ActiveMessenger() {}
 
 trace::TraceEventIDType ActiveMessenger::makeTraceCreationSend(
   HandlerType const handler, ByteType serialized_msg_size, bool is_bcast

diff --git a/src/vt/termination/termination.h b/src/vt/termination/termination.h
@@ -785,7 +785,6 @@ struct TerminationDetector :
 
 public:
   inline EpochType getEpoch() const;
-  inline EpochType getGlobalEpoch() const;
   inline void pushEpoch(EpochType const& epoch);
   inline EpochType popEpoch(EpochType const& epoch = no_epoch);
 

diff --git a/src/vt/termination/termination.impl.h b/src/vt/termination/termination.impl.h
@@ -135,14 +135,13 @@ inline void TerminationDetector::produceConsume(
   }
 }
 
-inline EpochType TerminationDetector::getGlobalEpoch() const {
+inline EpochType TerminationDetector::getEpoch() const {
   vtAssertInfo(
     epoch_stack_.size() > 0, "Epoch stack size must be greater than zero",
     epoch_stack_.size()
   );
   return epoch_stack_.size() ? EpochType{epoch_stack_.top()} : term::any_epoch_sentinel;
 }
-
  inline void TerminationDetector::pushEpoch(EpochType const& epoch) {
   /*
    * pushEpoch(epoch) pushes any epoch onto the local stack iff epoch !=
@@ -181,9 +180,6 @@ inline EpochType TerminationDetector::popEpoch(EpochType const& epoch) {
   }
 }
 
-inline EpochType TerminationDetector::getEpoch() const {
-  return getGlobalEpoch();
-}
 
 }} /* end namespace vt::term */