misc: Merge branch 'release-staging-v21-0' into develop

Change-Id: I0ad043ded56fb848e045057a1e7a56ea39797906
2021-03-18 11:13:14 -07:00
parent 6a7403f1a2 377a96644e
commit 68064d8043
49 changed files with 9819 additions and 226 deletions
--- a/src/base/stats/units.hh
+++ b/src/base/stats/units.hh
@@ -47,10 +47,9 @@
 #define UNIT_RATE(T1, T2) Stats::Units::Rate<T1, T2>::get()
 #define UNIT_RATIO Stats::Units::Ratio::get()
 #define UNIT_COUNT Stats::Units::Count::get()
+#define UNIT_WATT Stats::Units::Watt::get()
 #define UNIT_UNSPECIFIED Stats::Units::Unspecified::get()

-#define UNIT_WATT UNIT_RATE(Stats::Units::Joule, Stats::Units::Second)
-
 namespace Stats {

 /**