Make sequence number in AtomicBatchDispatcher<....>::Token non-const

Summary:
Make sequence number in AtomicBatchDispatcher<....>::Token non-const:
- The field is already private and having it as const prevents a
  move assignment operator from getting defined

Reviewed By: yfeldblum

Differential Revision: D4114851

fbshipit-source-id: 9f7a4003daff02c007c01747cca6ae9da17fcb79

diff --git a/folly/fibers/AtomicBatchDispatcher-inl.h b/folly/fibers/AtomicBatchDispatcher-inl.h
index 45209cc6260406d027dd040c367ace4b5b2793c1..7427bd56319f3ca05f6b34df01d4d37ecd55f88b 100644 (file)
--- a/folly/fibers/AtomicBatchDispatcher-inl.h
+++ b/folly/fibers/AtomicBatchDispatcher-inl.h
@@ -146,7 +146,7 @@ template <typename InputT, typename ResultT>
 AtomicBatchDispatcher<InputT, ResultT>::Token::Token(
     std::shared_ptr<DispatchBaton> baton,
     size_t sequenceNumber)
-    : baton_(std::move(baton)), SEQUENCE_NUMBER(sequenceNumber) {}
+    : baton_(std::move(baton)), sequenceNumber_(sequenceNumber) {}
 
 template <typename InputT, typename ResultT>
 Future<ResultT> AtomicBatchDispatcher<InputT, ResultT>::Token::dispatch(
@@ -156,7 +156,7 @@ Future<ResultT> AtomicBatchDispatcher<InputT, ResultT>::Token::dispatch(
     throw std::logic_error(
         "Dispatch called more than once on the same Token object");
   }
-  return baton->getFutureResult(std::move(input), SEQUENCE_NUMBER);
+  return baton->getFutureResult(std::move(input), sequenceNumber_);
 }
 
 template <typename InputT, typename ResultT>

diff --git a/folly/fibers/AtomicBatchDispatcher.h b/folly/fibers/AtomicBatchDispatcher.h
index bfeafa272de8748c4eceac052e5ac24c2cbef7b7..7b1db369fbe16e7d74eeb14257eb3a2880594175 100644 (file)
--- a/folly/fibers/AtomicBatchDispatcher.h
+++ b/folly/fibers/AtomicBatchDispatcher.h
@@ -153,7 +153,7 @@ class AtomicBatchDispatcher {
     Token& operator=(const Token&) = delete;
 
     std::shared_ptr<DispatchBaton> baton_;
-    const size_t SEQUENCE_NUMBER;
+    size_t sequenceNumber_;
   };
 
   explicit AtomicBatchDispatcher(DispatchFunctionT&& dispatchFunc);