From f225548427e2e316f64867e1da7f323eef8f4a72 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Wed, 2 Dec 2015 17:18:07 +0100 Subject: [PATCH] C++14 - barrier --- include/boost/fiber/barrier.hpp | 2 +- src/barrier.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/fiber/barrier.hpp b/include/boost/fiber/barrier.hpp index 7e4c1ad6..0596c71f 100644 --- a/include/boost/fiber/barrier.hpp +++ b/include/boost/fiber/barrier.hpp @@ -31,7 +31,7 @@ private: condition cond_{}; public: - barrier( std::size_t); + explicit barrier( std::size_t); barrier( barrier const&) = delete; barrier & operator=( barrier const&) = delete; diff --git a/src/barrier.cpp b/src/barrier.cpp index 0b924cdd..a23ab50d 100644 --- a/src/barrier.cpp +++ b/src/barrier.cpp @@ -18,8 +18,8 @@ namespace boost { namespace fibers { barrier::barrier( std::size_t initial) : - initial_( initial), - current_( initial_) { + initial_{ initial }, + current_{ initial_ } { if ( 0 == initial) { throw invalid_argument( static_cast< int >( std::errc::invalid_argument), "boost fiber: zero initial barrier count"); @@ -29,7 +29,7 @@ barrier::barrier( std::size_t initial) : bool barrier::wait() { std::unique_lock< mutex > lk( mtx_); - const bool cycle( cycle_); + const bool cycle = cycle_; if ( 0 == --current_) { cycle_ = ! cycle_; current_ = initial_;