Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67359?usp=email )
Change subject: base: Remove the Stats namespace
......................................................................
base: Remove the Stats namespace
This namespace has gone through the deprecation period
and can now be removed.
Change-Id: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Signed-off-by: Daniel R. Carvalho <oda...@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67359
Maintainer: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/base/statistics.cc
M src/base/statistics.hh
M src/base/stats/group.cc
M src/base/stats/group.hh
M src/base/stats/group.test.cc
M src/base/stats/hdf5.cc
M src/base/stats/hdf5.hh
M src/base/stats/info.cc
M src/base/stats/info.hh
M src/base/stats/output.hh
M src/base/stats/storage.cc
M src/base/stats/storage.hh
M src/base/stats/text.cc
M src/base/stats/text.hh
M src/base/stats/types.hh
M src/base/stats/units.hh
M src/python/pybind11/stats.cc
M src/sim/power/mathexpr_powermodel.hh
M src/sim/stat_control.cc
M src/sim/stat_control.hh
M src/sim/stat_register.cc
M src/sim/stat_register.hh
22 files changed, 20 insertions(+), 24 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index c380143..2fddf1b 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 24cbf71..8156be5 100644
--- a/src/base/statistics.hh
+++ b/src/base/statistics.hh
@@ -91,7 +91,6 @@
{
/* 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 d5626e6..93e7183 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 bd1183e..3c11e61 100644
--- a/src/base/stats/group.hh
+++ b/src/base/stats/group.hh
@@ -74,7 +74,6 @@
#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 e2e0598..5a7cde4 100644
--- a/src/base/stats/group.test.cc
+++ b/src/base/stats/group.test.cc
@@ -255,10 +255,10 @@
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 @@
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 03574b2..be548bf 100644
--- a/src/base/stats/hdf5.cc
+++ b/src/base/stats/hdf5.cc
@@ -59,7 +59,6 @@
}
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/hdf5.hh b/src/base/stats/hdf5.hh
index 7fa9999..ac21ee8a 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 c40b559..06e7ec9 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 9a5e2e7..98859cb 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 39b0804..23531e8 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 6b32dc5..3b2c091 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 cf22e10..eb1873b 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 db5743a..36282a3 100644
--- a/src/base/stats/text.cc
+++ b/src/base/stats/text.cc
@@ -67,7 +67,6 @@
} // anonymous namespace
-GEM5_DEPRECATED_NAMESPACE(Stats, statistics);
namespace statistics
{
diff --git a/src/base/stats/text.hh b/src/base/stats/text.hh
index 4bbe3ea..7be498d 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 92d594a..14f89ca 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 52e2e57..fe5b23d 100644
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -75,7 +75,6 @@
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 2c60b47..266f47e 100644
--- a/src/python/pybind11/stats.cc
+++ b/src/python/pybind11/stats.cc
@@ -83,7 +83,6 @@
#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 25338ee..f05214a 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 c388539..99c694a 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 22d3134..35d3ea8 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 fb3db1e..5e4bf39 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 d2504f3..e84e8eb 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
{
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67359?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I80f25af68e03fff3df8316cb4d1d2669687d0fe4
Gerrit-Change-Number: 67359
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Richard Cooper <richard.coo...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
