3 files changed, 6 insertions, 6 deletions

diff --git a/libtransport/src/utils/epoll_event_reactor.h b/libtransport/src/utils/epoll_event_reactor.h
index 8e7681c20..32d99c837 100644
--- a/libtransport/src/utils/epoll_event_reactor.h
+++ b/libtransport/src/utils/epoll_event_reactor.h
@@ -49,7 +49,7 @@ class EpollEventReactor : public EventReactor {
     if (it == event_callback_map_.end()) {
       {
         utils::SpinLock::Acquire locked(event_callback_map_lock_);
-        event_callback_map_[fd] = std::forward<EventHandler &&>(callback);
+        event_callback_map_[fd] = std::forward<EventHandler>(callback);
       }
 
       ret = addFileDescriptor(fd, events);
diff --git a/libtransport/src/utils/fd_deadline_timer.h b/libtransport/src/utils/fd_deadline_timer.h
index e15cd4d2a..cf0cde112 100644
--- a/libtransport/src/utils/fd_deadline_timer.h
+++ b/libtransport/src/utils/fd_deadline_timer.h
@@ -57,8 +57,8 @@ class FdDeadlineTimer : public DeadlineTimer<FdDeadlineTimer> {
 
     reactor_.addFileDescriptor(
         timer_fd_, events,
-        [callback = std::forward<WaitHandler &&>(callback)](
-            const Event &event) -> int {
+        [callback =
+             std::forward<WaitHandler>(callback)](const Event &event) -> int {
           uint64_t s = 0;
           std::error_code ec;
 
diff --git a/libtransport/src/utils/suffix_strategy.h b/libtransport/src/utils/suffix_strategy.h
index 96eaed662..4b3ddbc74 100644
--- a/libtransport/src/utils/suffix_strategy.h
+++ b/libtransport/src/utils/suffix_strategy.h
@@ -36,11 +36,11 @@ enum class NextSuffixStrategy : uint8_t {
 class SuffixStrategy {
  public:
   static constexpr uint32_t MAX_SUFFIX = std::numeric_limits<uint32_t>::max();
-  static constexpr uint8_t MAX_MANIFEST_CAPACITY =
+  static constexpr uint8_t MANIFEST_MAX_CAPACITY =
       std::numeric_limits<uint8_t>::max();
 
   SuffixStrategy(NextSuffixStrategy strategy, uint32_t offset = 0,
-                 uint32_t manifest_capacity = MAX_MANIFEST_CAPACITY)
+                 uint32_t manifest_capacity = MANIFEST_MAX_CAPACITY)
       : suffix_stragegy_(strategy),
         next_suffix_(offset),
         manifest_capacity_(manifest_capacity),
@@ -130,7 +130,7 @@ class SuffixStrategyFactory {
  public:
   static std::unique_ptr<SuffixStrategy> getSuffixStrategy(
       NextSuffixStrategy strategy, uint32_t start_offset = 0,
-      uint32_t manifest_capacity = SuffixStrategy::MAX_MANIFEST_CAPACITY) {
+      uint32_t manifest_capacity = SuffixStrategy::MANIFEST_MAX_CAPACITY) {
     switch (strategy) {
       case NextSuffixStrategy::INCREMENTAL:
         return std::make_unique<IncrementalSuffixStrategy>(start_offset);