From 0dffd35741fafc4d51102c7276b61306bfa73d87 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Wed, 4 May 2011 10:08:08 -0400 Subject: debug: fix help output --- src/base/debug.cc | 4 ++-- src/base/debug.hh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/base') diff --git a/src/base/debug.cc b/src/base/debug.cc index be301da07..71675aada 100644 --- a/src/base/debug.cc +++ b/src/base/debug.cc @@ -101,14 +101,14 @@ void CompoundFlag::enable() { SimpleFlag::enable(); - for_each(flags.begin(), flags.end(), mem_fun(&Flag::enable)); + for_each(_kids.begin(), _kids.end(), mem_fun(&Flag::enable)); } void CompoundFlag::disable() { SimpleFlag::disable(); - for_each(flags.begin(), flags.end(), mem_fun(&Flag::disable)); + for_each(_kids.begin(), _kids.end(), mem_fun(&Flag::disable)); } struct AllFlags : public Flag diff --git a/src/base/debug.hh b/src/base/debug.hh index ced6b4f48..d43117e71 100644 --- a/src/base/debug.hh +++ b/src/base/debug.hh @@ -44,6 +44,7 @@ class Flag protected: const char *_name; const char *_desc; + std::vector _kids; public: Flag(const char *name, const char *desc); @@ -51,6 +52,7 @@ class Flag std::string name() const { return _name; } std::string desc() const { return _desc; } + std::vector kids() { return _kids; } virtual void enable() = 0; virtual void disable() = 0; @@ -77,7 +79,12 @@ class SimpleFlag : public Flag class CompoundFlag : public SimpleFlag { protected: - std::vector flags; + void + addFlag(Flag &f) + { + if (&f != NULL) + _kids.push_back(&f); + } public: CompoundFlag(const char *name, const char *desc, @@ -99,13 +106,6 @@ class CompoundFlag : public SimpleFlag addFlag(f15); addFlag(f16); addFlag(f17); addFlag(f18); addFlag(f19); } - void - addFlag(Flag &f) - { - if (&f != NULL) - flags.push_back(&f); - } - void enable(); void disable(); }; -- cgit v1.2.3