diff --git a/src/arch/x86/bios/intelmp.hh b/src/arch/x86/bios/intelmp.hh index 19f2f7a9be..207b4ab61f 100644 --- a/src/arch/x86/bios/intelmp.hh +++ b/src/arch/x86/bios/intelmp.hh @@ -84,7 +84,6 @@ uint8_t writeOutString(PortProxy& proxy, Addr addr, std::string str, namespace X86ISA { -GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp); namespace intelmp { diff --git a/src/arch/x86/fs_workload.hh b/src/arch/x86/fs_workload.hh index b40b69b3c4..5c1187cda4 100644 --- a/src/arch/x86/fs_workload.hh +++ b/src/arch/x86/fs_workload.hh @@ -63,7 +63,6 @@ class SMBiosTable; } // namespace smbios -GEM5_DEPRECATED_NAMESPACE(IntelMP, intelmp); namespace intelmp { diff --git a/src/sim/core.cc b/src/sim/core.cc index c388652fa6..d836b550be 100644 --- a/src/sim/core.cc +++ b/src/sim/core.cc @@ -41,13 +41,11 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock); namespace sim_clock { /// The simulated frequency of curTick(). (In ticks per second) Tick Frequency; -GEM5_DEPRECATED_NAMESPACE(Float, as_float); namespace as_float { double s; @@ -62,7 +60,6 @@ double MHz; double GHz; } // namespace as_float -GEM5_DEPRECATED_NAMESPACE(Int, as_int); namespace as_int { Tick s; diff --git a/src/sim/core.hh b/src/sim/core.hh index bd432c2d21..bac4e40003 100644 --- a/src/sim/core.hh +++ b/src/sim/core.hh @@ -46,12 +46,10 @@ namespace gem5 /// These are variables that are set based on the simulator frequency ///@{ -GEM5_DEPRECATED_NAMESPACE(SimClock, sim_clock); namespace sim_clock { extern Tick Frequency; ///< The number of ticks that equal one second -GEM5_DEPRECATED_NAMESPACE(Float, as_float); namespace as_float { @@ -81,7 +79,6 @@ extern double GHz; ///< GHz * * @{ */ -GEM5_DEPRECATED_NAMESPACE(Int, as_int); namespace as_int { extern Tick s; ///< second diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index 28b5619a16..55e44c7adc 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -76,7 +76,6 @@ namespace gem5 using namespace statistics; -GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst); namespace pseudo_inst { diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh index 4794a41ffe..ba15370c55 100644 --- a/src/sim/pseudo_inst.hh +++ b/src/sim/pseudo_inst.hh @@ -55,7 +55,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(PseudoInst, pseudo_inst); namespace pseudo_inst {