From 01558a95f1724d76363a28ce95babb8b1933c89a Mon Sep 17 00:00:00 2001 From: luo rixin Date: Wed, 10 May 2023 19:33:59 +0800 Subject: [PATCH] crush/CrushLocation.cc: specialize namespace TOPNSPC to ceph remove namespace crimson::crush to a separate file, and remain namespace ceph::crush here. Signed-off-by: luo rixin (cherry picked from commit a25ec553e5d9b2c5fe9ef4d05b8dad4d5096da59) --- src/crush/CrushLocation.cc | 2 +- src/crush/CrushLocation.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc index 12a62064f1d2d..834e7b869c635 100644 --- a/src/crush/CrushLocation.cc +++ b/src/crush/CrushLocation.cc @@ -16,7 +16,7 @@ #include "include/compat.h" #include "include/str_list.h" -namespace TOPNSPC::crush { +namespace ceph::crush { int CrushLocation::update_from_conf() { diff --git a/src/crush/CrushLocation.h b/src/crush/CrushLocation.h index 026ad107d833a..189d4f7882b16 100644 --- a/src/crush/CrushLocation.h +++ b/src/crush/CrushLocation.h @@ -14,7 +14,7 @@ #include "common/ceph_mutex.h" #include "include/common_fwd.h" -namespace TOPNSPC::crush { +namespace ceph::crush { class CrushLocation { public: @@ -39,7 +39,7 @@ std::ostream& operator<<(std::ostream& os, const CrushLocation& loc); } #if FMT_VERSION >= 90000 -template <> struct fmt::formatter : fmt::ostream_formatter {}; +template <> struct fmt::formatter : fmt::ostream_formatter {}; #endif #endif -- 2.39.5