Commitd945654

committed

Minor changes to the thread_pool class and headers.

1 parent7a3e856 commitd945654Copy full SHA for d945654

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// Copyright 2010 Dean Michael Berris.`
`2`	`2`	`// Copyright 2012 Google, Inc.`
`3`		`-// Copyright (c) Glyn Matthews 2012.`
	`3`	`+// Copyright (c) Glyn Matthews 2012, 2013.`
`4`	`4`	`// Distributed under the Boost Software License, Version 1.0.`
`5`	`5`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`6`	`6`	`// http://www.boost.org/LICENSE_1_0.txt)`
`@@ -39,8 +39,8 @@ namespace network {`
`39`	`39`
`40`	`40`	`private:`
`41`	`41`
`42`		`-structpimpl;`
`43`		`-pimpl* pimpl_;`
	`42`	`+structimpl;`
	`43`	`+impl* pimpl_;`
`44`	`44`
`45`	`45`	`};`
`46`	`46`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// Copyright 2011 Dean Michael Berris <dberris@google.com>.`
`2`	`2`	`// Copyright 2011 Google, Inc.`
`3`		`-// Copyright (c) Glyn Matthews 2012.`
	`3`	`+// Copyright (c) Glyn Matthews 2012, 2013.`
`4`	`4`	`// Distributed under the Boost Software License, Version 1.0.`
`5`	`5`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`6`	`6`	`// http://www.boost.org/LICENSE_1_0.txt)`
`@@ -16,8 +16,8 @@`
`16`	`16`	`namespacenetwork {`
`17`	`17`	`namespaceconcurrency {`
`18`	`18`
`19`		`-structthread_pool::pimpl {`
`20`		`-pimpl(std::size_t threads =1,`
	`19`	`+structthread_pool::impl {`
	`20`	`+impl(std::size_t threads =1,`
`21`	`21`	`io_service_ptr io_service = io_service_ptr(),`
`22`	`22`	`std::vector<std::thread> worker_threads = std::vector<std::thread>())`
`23`	`23`	`: threads_(threads),`
`@@ -58,7 +58,7 @@ namespace network {`
`58`	`58`	`commit =true;`
`59`	`59`	`}`
`60`	`60`
`61`		`-~pimpl() {`
	`61`	`+~impl() {`
`62`	`62`	`sentinel_.reset();`
`63`	`63`	`try {`
`64`	`64`	`for (auto& thread : worker_threads_)`
`@@ -82,7 +82,7 @@ namespace network {`
`82`	`82`	`io_service_ptr io_service,`
`83`	`83`	`std::vector<std::thread> worker_threads)`
`84`	`84`	`: pimpl_(new (std::nothrow)`
`85`		`-pimpl(threads, io_service, std::move(worker_threads))) {`
	`85`	`+impl(threads, io_service, std::move(worker_threads))) {`
`86`	`86`
`87`	`87`	`}`
`88`	`88`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-// Copyright (c) Glyn Matthews 2012.`
	`1`	`+// Copyright (c) Glyn Matthews 2012, 2013.`
`2`	`2`	`// Distributed under the Boost Software License, Version 1.0.`
`3`	`3`	`// (See accompanying file LICENSE_1_0.txt or copy at`
`4`	`4`	`// http://www.boost.org/LICENSE_1_0.txt)`
`5`	`5`
`6`		`-#ifndef__NETWORK_UTILS_THREAD_POOL_INC__`
`7`		`-#define__NETWORK_UTILS_THREAD_POOL_INC__`
	`6`	`+#ifndefNETWORK_UTILS_THREAD_POOL_INC`
	`7`	`+#defineNETWORK_UTILS_THREAD_POOL_INC`
`8`	`8`
`9`	`9`	`#include<network/concurrency/thread_pool.hpp>`
`10`	`10`
`@@ -14,4 +14,4 @@ typedef ::network::concurrency::thread_pool thread_pool;`
`14`	`14`	`}// namespace utils`
`15`	`15`	`}// namespace network`
`16`	`16`
`17`		`-#endif//__NETWORK_UTILS_THREAD_POOL_INC__`
	`17`	`+#endif//NETWORK_UTILS_THREAD_POOL_INC`

Comments

(0)