logging: allow partial updates to log handler settings

[folly.git] / folly / MPMCPipeline.h

diff --git a/folly/MPMCPipeline.h b/folly/MPMCPipeline.h
index 4eae16439906f4fd859be9966cf33adb283a6c58..90a4c85aa25e3cd4f69febb5511704f5f7d95423 100644 (file)
--- a/folly/MPMCPipeline.h
+++ b/folly/MPMCPipeline.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 #include <glog/logging.h>
 
-#include "folly/detail/MPMCPipelineDetail.h"
+#include <folly/detail/MPMCPipelineDetail.h>
 
 namespace folly {
 
@@ -161,12 +161,15 @@ template <class In, class... Stages> class MPMCPipeline {
 #endif
         remainingUses_(amplification),
         value_(value * amplification) {
+      (void)owner; // -Wunused-parameter
     }
 
     uint64_t use(MPMCPipeline* owner) {
       CHECK_GT(remainingUses_--, 0);
 #ifndef NDEBUG
       CHECK(owner == owner_);
+#else
+      (void)owner; // -Wunused-parameter
 #endif
       return value_++;
     }
@@ -176,7 +179,7 @@ template <class In, class... Stages> class MPMCPipeline {
    * Default-construct pipeline. Useful to move-assign later,
    * just like MPMCQueue, see MPMCQueue.h for more details.
    */
-  MPMCPipeline() { }
+  MPMCPipeline() = default;
 
   /**
    * Construct a pipeline with N+1 queue sizes.
@@ -272,14 +275,13 @@ template <class In, class... Stages> class MPMCPipeline {
    * in any queue) are also counted.
    */
   ssize_t sizeGuess() const noexcept {
-    return (std::get<0>(stages_).writeCount() * kAmplification -
-            std::get<sizeof...(Stages)>(stages_).readCount());
+    return ssize_t(
+        std::get<0>(stages_).writeCount() * kAmplification -
+        std::get<sizeof...(Stages)>(stages_).readCount());
   }
 
  private:
   StageTuple stages_;
 };
 
-
-}  // namespaces
-
+} // namespace folly