From: Ameya Limaye <ameyal@fb.com>
Date: Wed, 2 Nov 2016 03:28:09 +0000 (-0700)
Subject: Make sequence number in AtomicBatchDispatcher<....>::Token non-const
X-Git-Tag: v2016.11.07.00~15
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5e1b7327af577c40fb60cb1cdd08f9b413e2f2d6;p=folly.git

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 45209cc6..7427bd56 100644
--- 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 bfeafa27..7b1db369 100644
--- 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);