From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com>
Date: Thu, 21 Mar 2024 05:43:10 +0000 (+0000)
Subject: Make BodyPipe::MaxCapacity constexpr (#1748)
X-Git-Tag: SQUID_7_0_1~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c060c02e48a1fedfb5c163f8ec54b8aa7f68588;p=thirdparty%2Fsquid.git

Make BodyPipe::MaxCapacity constexpr (#1748)

Detected by Coverity. CID 1554661: Initialization or destruction
ordering is unspecified (GLOBAL_INIT_ORDER).
---

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index c686ce5cfd..e608bd615e 100644
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -97,7 +97,7 @@ public:
     typedef BodyConsumer Consumer;
     typedef BodyPipeCheckout Checkout;
 
-    enum { MaxCapacity = 64*1024 };
+    static constexpr size_t MaxCapacity = 64*1024;
 
     friend class BodyPipeCheckout;
 
diff --git a/src/adaptation/icap/ModXact.cc b/src/adaptation/icap/ModXact.cc
index d2f9529685..0568d242f6 100644
--- a/src/adaptation/icap/ModXact.cc
+++ b/src/adaptation/icap/ModXact.cc
@@ -42,7 +42,7 @@
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ModXact);
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Icap, ModXactLauncher);
 
-static const size_t TheBackupLimit = BodyPipe::MaxCapacity;
+static constexpr auto TheBackupLimit = BodyPipe::MaxCapacity;
 
 const SBuf Adaptation::Icap::ChunkExtensionValueParser::UseOriginalBodyName("use-original-body");