36d35
< #include <vector>
38a38
> #include "base/debug.hh"
40d39
< #include "base/traceflags.hh"
45a45,47
> using Debug::SimpleFlag;
> using Debug::CompoundFlag;
>
50,52d51
< typedef std::vector<bool> FlagVec;
< extern FlagVec flags;
< inline bool IsOn(int t) { return flags[t]; }
88c87
< #define DTRACE(x) (Trace::IsOn(Trace::x) && Trace::enabled)
---
> #define DTRACE(x) ((Debug::x) && Trace::enabled)
90a90
> using namespace Debug; \
95a96
> using namespace Debug; \
100c101,102
< #define DPRINTFS(x,s, ...) do { \
---
> #define DPRINTFS(x, s, ...) do { \
> using namespace Debug; \
102c104
< Trace::dprintf(curTick(), s->name(), __VA_ARGS__); \
---
> Trace::dprintf(curTick(), s->name(), __VA_ARGS__); \
105d106
<
106a108
> using namespace Debug; \