diff --git a/include/indicators/multi_progress.hpp b/include/indicators/multi_progress.hpp index 08e8ec0..4dcc698 100644 --- a/include/indicators/multi_progress.hpp +++ b/include/indicators/multi_progress.hpp @@ -27,14 +27,13 @@ SOFTWARE. #pragma once #define NOMINMAX #include -#include #include namespace indicators { -template class MultiProgress { + template class MultiProgress { public: - void add_progress_bar(ProgressBar &bar) { + void add_progress_bar(Indicator &bar) { _bars.push_back(bar); bar._multi_progress_mode = true; } @@ -60,7 +59,7 @@ public: private: std::atomic _started{false}; std::mutex _mutex; - std::vector> _bars; + std::vector> _bars; bool _all_completed() { bool result{true}; diff --git a/include/indicators/progress_bar.hpp b/include/indicators/progress_bar.hpp index 7de6f81..ccc0dea 100644 --- a/include/indicators/progress_bar.hpp +++ b/include/indicators/progress_bar.hpp @@ -147,7 +147,7 @@ private: std::mutex _mutex; Color _foreground_color{indicators::Color::WHITE}; - template friend class MultiProgress; + template friend class MultiProgress; std::atomic _multi_progress_mode{false}; std::ostream &_print_duration(std::ostream &os, std::chrono::nanoseconds ns) { diff --git a/samples/multi_progress.cpp b/samples/multi_progress.cpp index 7623087..c40d48d 100644 --- a/samples/multi_progress.cpp +++ b/samples/multi_progress.cpp @@ -1,3 +1,4 @@ +#include #include int main() { @@ -38,7 +39,7 @@ int main() { bar3.show_remaining_time(); bar3.set_prefix_text("Progress Bar #3 "); - indicators::MultiProgress<3> bars; + indicators::MultiProgress bars; bars.add_progress_bar(bar1); bars.add_progress_bar(bar2); bars.add_progress_bar(bar3);