Terminal comma for FutexResult enumerators

[folly.git] / folly / detail / Futex.h

diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index a6a5a06b2f6389ddcd034df20eada6e4beeb0d94..4bf7ac5b1baa06f870dec7a38e95f624a9a087ae 100644 (file)
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.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.
@@ -17,19 +17,21 @@
 #pragma once
 
 #include <atomic>
+#include <cassert>
 #include <chrono>
 #include <limits>
-#include <assert.h>
-#include <unistd.h>
+
 #include <boost/noncopyable.hpp>
 
+#include <folly/portability/Unistd.h>
+
 namespace folly { namespace detail {
 
 enum class FutexResult {
   VALUE_CHANGED, /* Futex value didn't match expected */
   AWOKEN,        /* futex wait matched with a futex wake */
   INTERRUPTED,   /* Spurious wake-up or signal caused futex wait failure */
-  TIMEDOUT
+  TIMEDOUT,
 };
 
 /**
@@ -44,7 +46,7 @@ enum class FutexResult {
 template <template <typename> class Atom = std::atomic>
 struct Futex : Atom<uint32_t>, boost::noncopyable {
 
-  explicit Futex(uint32_t init = 0) : Atom<uint32_t>(init) {}
+  explicit constexpr Futex(uint32_t init = 0) : Atom<uint32_t>(init) {}
 
   /** Puts the thread to sleep if this->load() == expected.  Returns true when
    *  it is returning because it has consumed a wake() event, false for any
@@ -136,29 +138,31 @@ struct EmulatedFutexAtomic : public std::atomic<T> {
   EmulatedFutexAtomic() noexcept = default;
   constexpr /* implicit */ EmulatedFutexAtomic(T init) noexcept
       : std::atomic<T>(init) {}
-  EmulatedFutexAtomic(const EmulatedFutexAtomic& rhs) = delete;
+  // It doesn't copy or move
+  EmulatedFutexAtomic(EmulatedFutexAtomic&& rhs) = delete;
 };
 
 /* Available specializations, with definitions elsewhere */
 
-template<>
+template <>
 int Futex<std::atomic>::futexWake(int count, uint32_t wakeMask);
 
-template<>
+template <>
 FutexResult Futex<std::atomic>::futexWaitImpl(
       uint32_t expected,
       std::chrono::time_point<std::chrono::system_clock>* absSystemTime,
       std::chrono::time_point<std::chrono::steady_clock>* absSteadyTime,
       uint32_t waitMask);
 
-template<>
+template <>
 int Futex<EmulatedFutexAtomic>::futexWake(int count, uint32_t wakeMask);
 
-template<>
+template <>
 FutexResult Futex<EmulatedFutexAtomic>::futexWaitImpl(
       uint32_t expected,
       std::chrono::time_point<std::chrono::system_clock>* absSystemTime,
       std::chrono::time_point<std::chrono::steady_clock>* absSteadyTime,
       uint32_t waitMask);
 
-}}
+} // namespace detail
+} // namespace folly