summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/kernel/parallel.hpp
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2013-01-03 08:10:25 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2013-01-03 08:10:25 +0000
commit2853156a2bce535bcaa440c37cf872916f76c03b (patch)
tree8e161033a9bac8274dcaca05940964b91cdb2bfc /sca-cpp/trunk/kernel/parallel.hpp
parent55607ea78e10832838d52fdb17cbdfe4355c3265 (diff)
Refactoring, rename isNil to isNull.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-cpp/trunk/kernel/parallel.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/sca-cpp/trunk/kernel/parallel.hpp b/sca-cpp/trunk/kernel/parallel.hpp
index 8b01bb819f..6981a67831 100644
--- a/sca-cpp/trunk/kernel/parallel.hpp
+++ b/sca-cpp/trunk/kernel/parallel.hpp
@@ -274,7 +274,7 @@ template<typename R> inline const future<R> submit(const worker& w, const lambda
* Enqueues shutdown requests.
*/
inline const bool shutdownEnqueue(const list<pthread_t>& threads, wqueue<blambda>& work) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
enqueue(work, result(false));
return shutdownEnqueue(cdr(threads), work);
@@ -284,7 +284,7 @@ inline const bool shutdownEnqueue(const list<pthread_t>& threads, wqueue<blambda
* Waits for shut down threads to terminate.
*/
inline const bool shutdownJoin(const list<pthread_t>& threads) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
pthread_join(car(threads), NULL);
return shutdownJoin(cdr(threads));
@@ -303,7 +303,7 @@ inline const bool shutdown(const worker& w) noexcept {
* Cancel a worker.
*/
inline const bool cancel(const list<pthread_t>& threads) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
pthread_cancel(car(threads));
return cancel(cdr(threads));