From b8ff1060243c183819c466f64003bd429b6c486b Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Fri, 7 May 2021 14:38:31 -0300 Subject: [PATCH] arch: Rename LockedMem namespace as locked_mem As part of recent decisions regarding namespace naming conventions, all namespaces will be changed to snake case. GenericISA::LockedMem became GenericISA::locked_mem. Change-Id: Ia939d8cb27ba4ba19837b7b4d7cb2819c8d5daed Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45432 Tested-by: kokoro Reviewed-by: Hoa Nguyen Maintainer: Gabe Black --- src/arch/generic/locked_mem.hh | 6 ++++-- src/arch/null/locked_mem.hh | 2 +- src/arch/power/locked_mem.hh | 2 +- src/arch/sparc/locked_mem.hh | 2 +- src/arch/x86/locked_mem.hh | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/arch/generic/locked_mem.hh b/src/arch/generic/locked_mem.hh index 66a8f43010..f963513b1e 100644 --- a/src/arch/generic/locked_mem.hh +++ b/src/arch/generic/locked_mem.hh @@ -47,13 +47,15 @@ * Generic helper functions for locked memory accesses. */ +#include "base/compiler.hh" #include "mem/packet.hh" #include "mem/request.hh" namespace GenericISA { -namespace LockedMem +GEM5_DEPRECATED_NAMESPACE(LockedMem, locked_mem); +namespace locked_mem { template @@ -88,7 +90,7 @@ globalClearExclusive(XC *xc) { } -} // namespace LockedMem +} // namespace locked_mem } // namespace Generic ISA diff --git a/src/arch/null/locked_mem.hh b/src/arch/null/locked_mem.hh index 876d8b9d59..8af3fdba4c 100644 --- a/src/arch/null/locked_mem.hh +++ b/src/arch/null/locked_mem.hh @@ -52,7 +52,7 @@ namespace NullISA { -using namespace GenericISA::LockedMem; +using namespace GenericISA::locked_mem; } // namespace NullISA diff --git a/src/arch/power/locked_mem.hh b/src/arch/power/locked_mem.hh index 153f602be5..5838490b9e 100644 --- a/src/arch/power/locked_mem.hh +++ b/src/arch/power/locked_mem.hh @@ -42,7 +42,7 @@ namespace PowerISA { -using namespace GenericISA::LockedMem; +using namespace GenericISA::locked_mem; } // namespace PowerISA diff --git a/src/arch/sparc/locked_mem.hh b/src/arch/sparc/locked_mem.hh index 5521828606..eaa6bb918e 100644 --- a/src/arch/sparc/locked_mem.hh +++ b/src/arch/sparc/locked_mem.hh @@ -40,7 +40,7 @@ namespace SparcISA { -using namespace GenericISA::LockedMem; +using namespace GenericISA::locked_mem; } // namespace SparcISA diff --git a/src/arch/x86/locked_mem.hh b/src/arch/x86/locked_mem.hh index 2ff4781709..adea8b7860 100644 --- a/src/arch/x86/locked_mem.hh +++ b/src/arch/x86/locked_mem.hh @@ -40,7 +40,7 @@ namespace X86ISA { -using namespace GenericISA::LockedMem; +using namespace GenericISA::locked_mem; } // namespace X86ISA