diff --git a/src/mem/cache/prefetch/stride.hh b/src/mem/cache/prefetch/stride.hh index 2b70765ba4..27fa917436 100644 --- a/src/mem/cache/prefetch/stride.hh +++ b/src/mem/cache/prefetch/stride.hh @@ -64,7 +64,6 @@ namespace gem5 { class BaseIndexingPolicy; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { class Base; diff --git a/src/mem/cache/replacement_policies/base.hh b/src/mem/cache/replacement_policies/base.hh index fc92ecb6ae..2c23c950b2 100644 --- a/src/mem/cache/replacement_policies/base.hh +++ b/src/mem/cache/replacement_policies/base.hh @@ -45,7 +45,6 @@ namespace gem5 */ typedef std::vector ReplacementCandidates; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/bip_rp.cc b/src/mem/cache/replacement_policies/bip_rp.cc index 102037ddfa..812c36bb71 100644 --- a/src/mem/cache/replacement_policies/bip_rp.cc +++ b/src/mem/cache/replacement_policies/bip_rp.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/bip_rp.hh b/src/mem/cache/replacement_policies/bip_rp.hh index 486f4597dd..0b830e0b79 100644 --- a/src/mem/cache/replacement_policies/bip_rp.hh +++ b/src/mem/cache/replacement_policies/bip_rp.hh @@ -49,7 +49,6 @@ namespace gem5 struct BIPRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/brrip_rp.cc b/src/mem/cache/replacement_policies/brrip_rp.cc index a28ad339d5..06dad0d9fb 100644 --- a/src/mem/cache/replacement_policies/brrip_rp.cc +++ b/src/mem/cache/replacement_policies/brrip_rp.cc @@ -38,7 +38,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/brrip_rp.hh b/src/mem/cache/replacement_policies/brrip_rp.hh index f4f815e056..5649a64070 100644 --- a/src/mem/cache/replacement_policies/brrip_rp.hh +++ b/src/mem/cache/replacement_policies/brrip_rp.hh @@ -60,7 +60,6 @@ namespace gem5 struct BRRIPRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/dueling_rp.hh b/src/mem/cache/replacement_policies/dueling_rp.hh index a4510508ef..c7400b4972 100644 --- a/src/mem/cache/replacement_policies/dueling_rp.hh +++ b/src/mem/cache/replacement_policies/dueling_rp.hh @@ -41,7 +41,6 @@ namespace gem5 struct DuelingRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/fifo_rp.cc b/src/mem/cache/replacement_policies/fifo_rp.cc index bc0680bc8a..199ba0a429 100644 --- a/src/mem/cache/replacement_policies/fifo_rp.cc +++ b/src/mem/cache/replacement_policies/fifo_rp.cc @@ -36,9 +36,10 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); + namespace replacement_policy { + FIFO::FIFO(const Params &p) : Base(p) { diff --git a/src/mem/cache/replacement_policies/fifo_rp.hh b/src/mem/cache/replacement_policies/fifo_rp.hh index 4b62fd220a..255666865d 100644 --- a/src/mem/cache/replacement_policies/fifo_rp.hh +++ b/src/mem/cache/replacement_policies/fifo_rp.hh @@ -44,7 +44,6 @@ namespace gem5 struct FIFORPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/lfu_rp.cc b/src/mem/cache/replacement_policies/lfu_rp.cc index a715f7d0dc..fc3495465e 100644 --- a/src/mem/cache/replacement_policies/lfu_rp.cc +++ b/src/mem/cache/replacement_policies/lfu_rp.cc @@ -36,7 +36,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/lfu_rp.hh b/src/mem/cache/replacement_policies/lfu_rp.hh index aa058c46bd..58c057ce35 100644 --- a/src/mem/cache/replacement_policies/lfu_rp.hh +++ b/src/mem/cache/replacement_policies/lfu_rp.hh @@ -44,7 +44,6 @@ namespace gem5 struct LFURPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/lru_rp.cc b/src/mem/cache/replacement_policies/lru_rp.cc index c22f3fe2ba..cbec50eb73 100644 --- a/src/mem/cache/replacement_policies/lru_rp.cc +++ b/src/mem/cache/replacement_policies/lru_rp.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/lru_rp.hh b/src/mem/cache/replacement_policies/lru_rp.hh index 620117dca5..6feaa4f73d 100644 --- a/src/mem/cache/replacement_policies/lru_rp.hh +++ b/src/mem/cache/replacement_policies/lru_rp.hh @@ -42,7 +42,6 @@ namespace gem5 struct LRURPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/mru_rp.cc b/src/mem/cache/replacement_policies/mru_rp.cc index 18b0d65e89..5040c22206 100644 --- a/src/mem/cache/replacement_policies/mru_rp.cc +++ b/src/mem/cache/replacement_policies/mru_rp.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/mru_rp.hh b/src/mem/cache/replacement_policies/mru_rp.hh index 1657ace3d5..5b5f0bf03d 100644 --- a/src/mem/cache/replacement_policies/mru_rp.hh +++ b/src/mem/cache/replacement_policies/mru_rp.hh @@ -44,7 +44,6 @@ namespace gem5 struct MRURPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/random_rp.cc b/src/mem/cache/replacement_policies/random_rp.cc index fc6c431b9d..8711c85ba3 100644 --- a/src/mem/cache/replacement_policies/random_rp.cc +++ b/src/mem/cache/replacement_policies/random_rp.cc @@ -37,7 +37,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/random_rp.hh b/src/mem/cache/replacement_policies/random_rp.hh index 9c383d5418..a2b384563c 100644 --- a/src/mem/cache/replacement_policies/random_rp.hh +++ b/src/mem/cache/replacement_policies/random_rp.hh @@ -42,7 +42,6 @@ namespace gem5 struct RandomRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/replaceable_entry.hh b/src/mem/cache/replacement_policies/replaceable_entry.hh index 6c56bca394..bb88cefd1d 100644 --- a/src/mem/cache/replacement_policies/replaceable_entry.hh +++ b/src/mem/cache/replacement_policies/replaceable_entry.hh @@ -38,7 +38,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/second_chance_rp.cc b/src/mem/cache/replacement_policies/second_chance_rp.cc index df506c638b..963052ee7f 100644 --- a/src/mem/cache/replacement_policies/second_chance_rp.cc +++ b/src/mem/cache/replacement_policies/second_chance_rp.cc @@ -35,7 +35,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/second_chance_rp.hh b/src/mem/cache/replacement_policies/second_chance_rp.hh index 4d0a36cdeb..79085d1d53 100644 --- a/src/mem/cache/replacement_policies/second_chance_rp.hh +++ b/src/mem/cache/replacement_policies/second_chance_rp.hh @@ -46,7 +46,6 @@ namespace gem5 struct SecondChanceRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/ship_rp.hh b/src/mem/cache/replacement_policies/ship_rp.hh index fa27540adb..edf4ff5a45 100644 --- a/src/mem/cache/replacement_policies/ship_rp.hh +++ b/src/mem/cache/replacement_policies/ship_rp.hh @@ -51,7 +51,6 @@ struct SHiPRPParams; struct SHiPMemRPParams; struct SHiPPCRPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.cc b/src/mem/cache/replacement_policies/tree_plru_rp.cc index 2ee987c959..5014785093 100644 --- a/src/mem/cache/replacement_policies/tree_plru_rp.cc +++ b/src/mem/cache/replacement_policies/tree_plru_rp.cc @@ -43,7 +43,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/tree_plru_rp.hh b/src/mem/cache/replacement_policies/tree_plru_rp.hh index 335670457c..1f7e91c33e 100644 --- a/src/mem/cache/replacement_policies/tree_plru_rp.hh +++ b/src/mem/cache/replacement_policies/tree_plru_rp.hh @@ -80,7 +80,6 @@ namespace gem5 struct TreePLRURPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.cc b/src/mem/cache/replacement_policies/weighted_lru_rp.cc index ed6a7f6166..ac8fd1015b 100644 --- a/src/mem/cache/replacement_policies/weighted_lru_rp.cc +++ b/src/mem/cache/replacement_policies/weighted_lru_rp.cc @@ -39,7 +39,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/replacement_policies/weighted_lru_rp.hh b/src/mem/cache/replacement_policies/weighted_lru_rp.hh index bc0e5735af..117b73b10f 100644 --- a/src/mem/cache/replacement_policies/weighted_lru_rp.hh +++ b/src/mem/cache/replacement_policies/weighted_lru_rp.hh @@ -42,7 +42,6 @@ namespace gem5 struct WeightedLRURPParams; -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { diff --git a/src/mem/cache/tags/sector_tags.hh b/src/mem/cache/tags/sector_tags.hh index c64621213d..bad132158c 100644 --- a/src/mem/cache/tags/sector_tags.hh +++ b/src/mem/cache/tags/sector_tags.hh @@ -47,7 +47,6 @@ namespace gem5 { -GEM5_DEPRECATED_NAMESPACE(ReplacementPolicy, replacement_policy); namespace replacement_policy { class Base;