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 c686ce5cfdfdca94f544e7ffa3f5f6703d4c4d60..e608bd615e8298557f9508f6090d0130a3cdaf3a 100644 (file)
--- 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 d2f9529685ddacfb9ed2973e99374f468a06ebc5..0568d242f6519d935b56f5f5bc80dfcc0bf224dd 100644 (file)
--- 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");