From 2ce456bd3f6a75b04bb465769de7cb8efae21972 Mon Sep 17 00:00:00 2001 From: Xiaoge Su Date: Tue, 5 Jul 2022 13:01:06 -0700 Subject: [PATCH] fixup! Fix minor issues * Reintroduce the anonymous namespace deleted by accident * Rename the guardian definition in OwningResource.h --- fdbserver/TransactionTagCounter.cpp | 5 +++++ flow/include/flow/OwningResource.h | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fdbserver/TransactionTagCounter.cpp b/fdbserver/TransactionTagCounter.cpp index 71c86ae628..8364ec8b08 100644 --- a/fdbserver/TransactionTagCounter.cpp +++ b/fdbserver/TransactionTagCounter.cpp @@ -21,6 +21,9 @@ #include "fdbserver/Knobs.h" #include "fdbserver/TransactionTagCounter.h" #include "flow/Trace.h" + +namespace { + class TopKTags { public: struct TagAndCount { @@ -75,6 +78,8 @@ public: void clear() { topTags.clear(); } }; +} // namespace + class TransactionTagCounterImpl { UID thisServerID; TransactionTagMap intervalCounts; diff --git a/flow/include/flow/OwningResource.h b/flow/include/flow/OwningResource.h index 5636aac9de..c08ef68050 100644 --- a/flow/include/flow/OwningResource.h +++ b/flow/include/flow/OwningResource.h @@ -18,8 +18,8 @@ * limitations under the License. */ -#ifndef FLOW_SAFE_ACCESS_REF_H -#define FLOW_SAFE_ACCESS_REF_H +#ifndef FLOW_OWNING_REOSURCE_H +#define FLOW_OWNING_REOSURCE_H #include "flow/FastRef.h" @@ -116,4 +116,4 @@ public: ResourceWeakRef(const ResourceWeakRef& ref) : details::ResourceRef(ref.resourceRef) {} }; -#endif // FLOW_SAFE_ACCESS_REF_H \ No newline at end of file +#endif // FLOW_OWNING_REOSURCE_H \ No newline at end of file