Skip to content

Commit 1033e82

Browse files
committed
don't suppress compiler warnings; update NEWS
1 parent d54273a commit 1033e82

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

inst/NEWS

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
RcppParallel 2018.1.0 (unreleased)
1+
RcppParallel 4.4.0
22
------------------------------------------------------------------------
33

4+
* Respect user-defined compiler settings (e.g. from ~/.R/Makevars).
5+
* Remove TBB's attempts to suppress compiler diagnostics.
46
* Allow setting the number of threads to use via RCPP_PARALLEL_NUM_THREADS
57
environment variable.
68
* Update to TBB 2018 Update 1.

inst/include/tbb/flow_graph_opencl_node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ void opencl_factory<DeviceFilter>::init_once() {
12331233
// Suppress "declared deprecated" warning for the next line.
12341234
#if __TBB_GCC_WARNING_SUPPRESSION_PRESENT
12351235
#pragma GCC diagnostic push
1236-
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1236+
// #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
12371237
#endif
12381238
#if _MSC_VER || __INTEL_COMPILER
12391239
#pragma warning( push )

src/Makevars.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Calls to 'firstword' are used to strip out
2-
# a possible '-m64' attached to the CC variable
3-
# (or other compiler arguments)
41
PKG_CPPFLAGS += @CXX11STD@ -I../inst/include/
52

63
ifeq ($(OS), Windows_NT)

src/tbb/include/tbb/flow_graph_opencl_node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ class opencl_factory {
11281128
// Suppress "declared deprecated" warning for the next line.
11291129
#if __TBB_GCC_WARNING_SUPPRESSION_PRESENT
11301130
#pragma GCC diagnostic push
1131-
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1131+
// #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
11321132
#endif
11331133
#if _MSC_VER || __INTEL_COMPILER
11341134
#pragma warning( push )

src/tbb/include/tbb/tbb_machine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ struct machine_load_store_seq_cst<T,8> {
665665
static void store ( volatile T &location, T value ) {
666666
#if __TBB_GCC_VERSION >= 40702
667667
#pragma GCC diagnostic push
668-
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
668+
// #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
669669
#endif
670670
// An atomic initialization leads to reading of uninitialized memory
671671
int64_t result = (volatile int64_t&)location;

0 commit comments

Comments
 (0)