diff --git a/src/sled/futures/future.h b/src/sled/futures/future.h index 4ca0f2e..d16181e 100644 --- a/src/sled/futures/future.h +++ b/src/sled/futures/future.h @@ -338,7 +338,7 @@ public: return result; } - static Future successful(const T &value) noexcept + static Future Successful(const T &value) noexcept { Future result = Future::Create(); result.FillSuccess(value); diff --git a/src/sled/futures/internal/promise.h b/src/sled/futures/internal/promise.h index 8c73a62..aa1ad14 100644 --- a/src/sled/futures/internal/promise.h +++ b/src/sled/futures/internal/promise.h @@ -18,7 +18,7 @@ class Promise { public: using Value = T; - Promise() = default; + Promise() noexcept = default; Promise(const Promise &) noexcept = default; Promise(Promise &&) noexcept = default; Promise &operator=(const Promise &) noexcept = default; diff --git a/src/sled/nonstd/fsm.h b/src/sled/nonstd/fsm.h index ba482ad..2e72ba6 100644 --- a/src/sled/nonstd/fsm.h +++ b/src/sled/nonstd/fsm.h @@ -61,7 +61,8 @@ struct is_invocable_test { }; template -using is_invocable = typename std::integral_constant(0)) == 1>::type; +using fsm_is_invocable = + typename std::integral_constant(0)) == 1>::type; #else #error "fsmlite requires C++11 support." #endif @@ -101,10 +102,10 @@ invoke(M T::*f, T1 &&obj, Args &&...args) template::value, - bool f2 = is_invocable::value, - bool f3 = is_invocable::value, - bool f4 = is_invocable::value> + bool f1 = fsm_is_invocable::value, + bool f2 = fsm_is_invocable::value, + bool f3 = fsm_is_invocable::value, + bool f4 = fsm_is_invocable::value> struct binary_fn_helper; template