37a38
> #include "systemc/core/time.hh"
48,74d48
< const char *TimeUnitNames[] = {
< [SC_FS] = "fs",
< [SC_PS] = "ps",
< [SC_NS] = "ns",
< [SC_US] = "us",
< [SC_MS] = "ms",
< [SC_SEC] = "s"
< };
<
< double TimeUnitScale[] = {
< [SC_FS] = 1.0e-15,
< [SC_PS] = 1.0e-12,
< [SC_NS] = 1.0e-9,
< [SC_US] = 1.0e-6,
< [SC_MS] = 1.0e-3,
< [SC_SEC] = 1.0
< };
<
< Tick TimeUnitFrequency[] = {
< [SC_FS] = 1ULL * 1000 * 1000 * 1000 * 1000 * 1000,
< [SC_PS] = 1ULL * 1000 * 1000 * 1000 * 1000,
< [SC_NS] = 1ULL * 1000 * 1000 * 1000,
< [SC_US] = 1ULL * 1000 * 1000,
< [SC_MS] = 1ULL * 1000,
< [SC_SEC] = 1ULL
< };
<
93c67
< double scale = TimeUnitScale[tu] * SimClock::Float::s;
---
> double scale = sc_gem5::TimeUnitScale[tu] * SimClock::Float::s;
325c299
< os << scaled << ' ' << TimeUnitNames[tu];
---
> os << scaled << ' ' << sc_gem5::TimeUnitNames[tu];
430,431c404,405
< double seconds = d * TimeUnitScale[tu];
< if (seconds < TimeUnitScale[SC_FS]) {
---
> double seconds = d * sc_gem5::TimeUnitScale[tu];
> if (seconds < sc_gem5::TimeUnitScale[SC_FS]) {
448c422,423
< Tick ticks_per_second = TimeUnitFrequency[tu] / static_cast<Tick>(d);
---
> Tick ticks_per_second =
> sc_gem5::TimeUnitFrequency[tu] / static_cast<Tick>(d);
495c470
< defaultUnit = d * TimeUnitScale[tu];
---
> defaultUnit = d * sc_gem5::TimeUnitScale[tu];
500c475
< resolution = TimeUnitScale[SC_PS];
---
> resolution = sc_gem5::TimeUnitScale[SC_PS];