Skip to content

Commit 0886bd5

Browse files
committed
avoid compiler error with clang 9
1 parent 2c09762 commit 0886bd5

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: RcppParallel
22
Type: Package
33
Title: Parallel Programming Tools for 'Rcpp'
4-
Version: 4.4.3
4+
Version: 4.4.3-9000
55
Authors@R: c(
66
person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
77
person("Romain", "Francois", role = c("aut", "cph")),

inst/include/RcppParallel/TinyThread.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,14 @@ std::vector<IndexRange> splitInputRange(const IndexRange& range,
105105
inline void ttParallelFor(std::size_t begin, std::size_t end,
106106
Worker& worker, std::size_t grainSize = 1) {
107107

108-
using namespace tthread;
109-
110108
// split the work
111109
IndexRange inputRange(begin, end);
112110
std::vector<IndexRange> ranges = splitInputRange(inputRange, grainSize);
113111

114112
// create threads
115-
std::vector<thread*> threads;
113+
std::vector<tthread::thread*> threads;
116114
for (std::size_t i = 0; i<ranges.size(); ++i) {
117-
threads.push_back(new thread(workerThread, new Work(ranges[i], worker)));
115+
threads.push_back(new tthread::thread(workerThread, new Work(ranges[i], worker)));
118116
}
119117

120118
// join and delete them
@@ -129,19 +127,17 @@ template <typename Reducer>
129127
inline void ttParallelReduce(std::size_t begin, std::size_t end,
130128
Reducer& reducer, std::size_t grainSize = 1) {
131129

132-
using namespace tthread;
133-
134130
// split the work
135131
IndexRange inputRange(begin, end);
136132
std::vector<IndexRange> ranges = splitInputRange(inputRange, grainSize);
137133

138134
// create threads (split for each thread and track the allocated workers)
139-
std::vector<thread*> threads;
135+
std::vector<tthread::thread*> threads;
140136
std::vector<Worker*> workers;
141137
for (std::size_t i = 0; i<ranges.size(); ++i) {
142138
Reducer* pReducer = new Reducer(reducer, RcppParallel::Split());
143139
workers.push_back(pReducer);
144-
threads.push_back(new thread(workerThread, new Work(ranges[i], *pReducer)));
140+
threads.push_back(new tthread::thread(workerThread, new Work(ranges[i], *pReducer)));
145141
}
146142

147143
// wait for each thread, join it's results, then delete the worker & thread

0 commit comments

Comments
 (0)