From b440e04a3cc21fcbe00f97cfd702a8737384c840 Mon Sep 17 00:00:00 2001 From: Bryce Lorenz Kille Date: Mon, 10 Jul 2023 12:47:26 -0500 Subject: [PATCH] Make progcontainer a child class --- src/map/include/base_types.hpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/map/include/base_types.hpp b/src/map/include/base_types.hpp index c6e44c5..3bdc4ed 100644 --- a/src/map/include/base_types.hpp +++ b/src/map/include/base_types.hpp @@ -225,12 +225,9 @@ namespace skch , seqName(id) { } }; - struct InputSeqProgContainer + struct InputSeqProgContainer : InputSeqContainer { - seqno_t seqCounter; //sequence counter - offset_t len; //sequence length - std::string seq; //sequence string - std::string seqName; //sequence id + using InputSeqContainer::InputSeqContainer; progress_meter::ProgressMeter& progress; //progress meter (shared) @@ -241,10 +238,7 @@ namespace skch * @param[in] len length of sequence */ InputSeqProgContainer(const std::string& s, const std::string& id, seqno_t seqcount, progress_meter::ProgressMeter& pm) - : seqCounter(seqcount) - , len(s.length()) - , seq(s) - , seqName(id) + : InputSeqContainer(s, id, seqcount) , progress(pm) { } };