diff --git a/src/base/statistics.cc b/src/base/statistics.cc index c3801436e7..2fddf1bab6 100644 --- a/src/base/statistics.cc +++ b/src/base/statistics.cc @@ -53,7 +53,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/statistics.hh b/src/base/statistics.hh index 24cbf714f5..8156be5a79 100644 --- a/src/base/statistics.hh +++ b/src/base/statistics.hh @@ -91,7 +91,6 @@ namespace gem5 { /* A namespace for all of the Statistics */ -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/group.cc b/src/base/stats/group.cc index d5626e6bb1..93e7183f0e 100644 --- a/src/base/stats/group.cc +++ b/src/base/stats/group.cc @@ -47,7 +47,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/group.hh b/src/base/stats/group.hh index bd1183e4a9..3c11e61138 100644 --- a/src/base/stats/group.hh +++ b/src/base/stats/group.hh @@ -74,7 +74,6 @@ namespace gem5 #define ADD_STAT(n, ...) n(this, #n, __VA_ARGS__) -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/group.test.cc b/src/base/stats/group.test.cc index e2e059830c..5a7cde4928 100644 --- a/src/base/stats/group.test.cc +++ b/src/base/stats/group.test.cc @@ -255,10 +255,10 @@ TEST(StatsGroupTest, ConstructTwoLevelsUnbalancedTree) ASSERT_EQ(node2_2.getStatGroups().size(), 0); } -class DummyInfo : public Stats::Info +class DummyInfo : public statistics::Info { public: - using Stats::Info::Info; + using statistics::Info::Info; int value = 0; @@ -266,7 +266,7 @@ class DummyInfo : public Stats::Info void prepare() override {} void reset() override { value = 0; } bool zero() const override { return false; } - void visit(Stats::Output &visitor) override {} + void visit(statistics::Output &visitor) override {} }; /** Test adding stats to a group. */ diff --git a/src/base/stats/hdf5.cc b/src/base/stats/hdf5.cc index 03574b2e4d..be548bf806 100644 --- a/src/base/stats/hdf5.cc +++ b/src/base/stats/hdf5.cc @@ -59,7 +59,6 @@ bool emptyStrings(const T &labels) } -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/hdf5.hh b/src/base/stats/hdf5.hh index 7fa99991a6..ac21ee8af1 100644 --- a/src/base/stats/hdf5.hh +++ b/src/base/stats/hdf5.hh @@ -53,7 +53,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/info.cc b/src/base/stats/info.cc index c40b55918e..06e7ec977d 100644 --- a/src/base/stats/info.cc +++ b/src/base/stats/info.cc @@ -52,7 +52,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/info.hh b/src/base/stats/info.hh index 9a5e2e77ab..98859cb0d9 100644 --- a/src/base/stats/info.hh +++ b/src/base/stats/info.hh @@ -43,7 +43,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/output.hh b/src/base/stats/output.hh index 39b0804a40..23531e8493 100644 --- a/src/base/stats/output.hh +++ b/src/base/stats/output.hh @@ -49,7 +49,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/storage.cc b/src/base/stats/storage.cc index 6b32dc501a..3b2c091815 100644 --- a/src/base/stats/storage.cc +++ b/src/base/stats/storage.cc @@ -46,7 +46,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/storage.hh b/src/base/stats/storage.hh index cf22e10080..eb1873b934 100644 --- a/src/base/stats/storage.hh +++ b/src/base/stats/storage.hh @@ -42,7 +42,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/text.cc b/src/base/stats/text.cc index db5743ac57..36282a35d7 100644 --- a/src/base/stats/text.cc +++ b/src/base/stats/text.cc @@ -67,7 +67,6 @@ constexpr auto Nan = std::numeric_limits::quiet_NaN(); } // anonymous namespace -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh index 4bbe3eadfe..7be498d8da 100644 --- a/src/base/stats/text.hh +++ b/src/base/stats/text.hh @@ -53,7 +53,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/types.hh b/src/base/stats/types.hh index 92d594ab77..14f89caff3 100644 --- a/src/base/stats/types.hh +++ b/src/base/stats/types.hh @@ -39,7 +39,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/base/stats/units.hh b/src/base/stats/units.hh index 52e2e57ce8..fe5b23d878 100644 --- a/src/base/stats/units.hh +++ b/src/base/stats/units.hh @@ -75,7 +75,6 @@ namespace gem5 UNIT_UNSPECIFIED, statistics::units::Unspecified::get(), \ "Use statistics::units::Unspecified::get()") -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/python/pybind11/stats.cc b/src/python/pybind11/stats.cc index 2c60b47ee4..266f47e52a 100644 --- a/src/python/pybind11/stats.cc +++ b/src/python/pybind11/stats.cc @@ -83,7 +83,6 @@ cast_stat_info(const statistics::Info *info) #undef TRY_CAST } -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/sim/power/mathexpr_powermodel.hh b/src/sim/power/mathexpr_powermodel.hh index 25338eea43..f05214a16f 100644 --- a/src/sim/power/mathexpr_powermodel.hh +++ b/src/sim/power/mathexpr_powermodel.hh @@ -47,7 +47,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { class Info; diff --git a/src/sim/stat_control.cc b/src/sim/stat_control.cc index c388539551..99c694a384 100644 --- a/src/sim/stat_control.cc +++ b/src/sim/stat_control.cc @@ -57,7 +57,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/sim/stat_control.hh b/src/sim/stat_control.hh index 22d3134370..35d3ea8fcb 100644 --- a/src/sim/stat_control.hh +++ b/src/sim/stat_control.hh @@ -48,7 +48,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/sim/stat_register.cc b/src/sim/stat_register.cc index fb3db1e4b1..5e4bf3908e 100644 --- a/src/sim/stat_register.cc +++ b/src/sim/stat_register.cc @@ -42,7 +42,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics { diff --git a/src/sim/stat_register.hh b/src/sim/stat_register.hh index d2504f3f02..e84e8ebdb6 100644 --- a/src/sim/stat_register.hh +++ b/src/sim/stat_register.hh @@ -47,7 +47,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(Stats, statistics); namespace statistics {