Skip to content

Commit c321d57

Browse files
kevinusheykevinushey
committed
more cleanup; remove GNU-isms
1 parent a4a9d45 commit c321d57

33 files changed

+134
-120
lines changed

‎DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ License: GPL (>= 3)
3535
URL: https://rcppcore.github.io/RcppParallel/, https://github.com/RcppCore/RcppParallel
3636
BugReports: https://github.com/RcppCore/RcppParallel/issues
3737
Biarch: TRUE
38-
RoxygenNote: 7.1.1
38+
RoxygenNote: 7.3.2
3939
Encoding: UTF-8

‎src/Makevars.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ TBB_NAME = @TBB_NAME@
77

88
PKG_CPPFLAGS = @PKG_CPPFLAGS@
99
PKG_CXXFLAGS = @CXX11STD@ -DRCPP_PARALLEL_USE_TBB=1
10-
PKG_CXXFLAGS += -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1
1110

1211
PKG_LIBS = @PKG_LIBS@ @PKG_LIBS_EXTRA@
1312

14-
.PHONY: all tbb tbb-clean
15-
1613
all: tbb $(SHLIB)
1714

1815
# TBB needs to be built before our C++ sources are built, so that

‎src/install.libs.R

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,27 @@ useSystemTbb <- function(tbbLib, tbbInc) {
8585
}
8686

8787
useBundledTbb <- function() {
88+
8889
useTbbPreamble("tbb/include")
8990
dir.create("tbb/build", showWarnings = FALSE)
90-
system("cd tbb/build; cmake -DTBB_TEST=0 -DTBB_EXAMPLES=0 .. && cmake --build .")
91+
92+
writeLines("*** configuring tbb")
93+
status <- system("cd tbb/build; cmake -DTBB_TEST=0 -DTBB_EXAMPLES=0 -DTBB_STRICT=0 .. > build.log 2>&1")
94+
if (status != 0L) {
95+
system("cat build.log")
96+
stop("error configuring tbb (status code ", status, ")")
97+
}
98+
99+
writeLines("*** building tbb")
100+
status <- system("cd tbb/build; cmake --build . > build.log 2>&1")
101+
if (status != 0L) {
102+
system("cat build.log")
103+
stop("error building tbb (status code ", status, ")")
104+
}
105+
91106
system("cd tbb/build; mv *_relwithdebinfo lib_release")
107+
writeLines("*** finished building tbb")
108+
92109
}
93110

94111

‎src/tbb/include/oneapi/tbb/collaborative_call_once.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace d1 {
2828

2929
#if _MSC_VER && !defined(__INTEL_COMPILER)
3030
// Suppress warning: structure was padded due to alignment specifier
31-
#pragma warning (push)
32-
#pragma warning (disable: 4324)
31+
// #pragma warning (push)
32+
// #pragma warning (disable: 4324)
3333
#endif
3434

3535
template <typename F>
@@ -243,7 +243,7 @@ void collaborative_call_once(collaborative_once_flag& flag, Fn&& fn, Args&&... a
243243
}
244244

245245
#if _MSC_VER && !defined(__INTEL_COMPILER)
246-
#pragma warning (pop) // 4324 warning
246+
// #pragma warning (pop) // 4324 warning
247247
#endif
248248

249249
} // namespace d1

‎src/tbb/include/oneapi/tbb/detail/_concurrent_queue_base.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class micro_queue_pop_finalizer;
4747

4848
#if _MSC_VER && !defined(__INTEL_COMPILER)
4949
// unary minus operator applied to unsigned type, result still unsigned
50-
#pragma warning( push )
51-
#pragma warning( disable: 4146 )
50+
// #pragma warning( push )
51+
// #pragma warning( disable: 4146 )
5252
#endif
5353

5454
// A queue using simple locking.
@@ -358,7 +358,7 @@ class micro_queue {
358358
}; // class micro_queue
359359

360360
#if _MSC_VER && !defined(__INTEL_COMPILER)
361-
#pragma warning( pop )
361+
// #pragma warning( pop )
362362
#endif // warning 4146 is back
363363

364364
template <typename Container, typename T, typename Allocator>
@@ -400,8 +400,8 @@ class micro_queue_pop_finalizer {
400400

401401
#if _MSC_VER && !defined(__INTEL_COMPILER)
402402
// structure was padded due to alignment specifier
403-
#pragma warning( push )
404-
#pragma warning( disable: 4324 )
403+
// #pragma warning( push )
404+
// #pragma warning( disable: 4324 )
405405
#endif
406406

407407
template <typename T, typename Allocator>
@@ -502,7 +502,7 @@ struct concurrent_queue_rep {
502502
}; // class concurrent_queue_rep
503503

504504
#if _MSC_VER && !defined(__INTEL_COMPILER)
505-
#pragma warning( pop )
505+
// #pragma warning( pop )
506506
#endif
507507

508508
template <typename Value, typename Allocator>

‎src/tbb/include/oneapi/tbb/detail/_concurrent_skip_list.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
#endif
4444

4545
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
46-
#pragma warning(push)
47-
#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
46+
// #pragma warning(push)
47+
// #pragma warning(disable: 4127) // warning C4127: conditional expression is constant
4848
#endif
4949

5050
namespace tbb {
@@ -1284,7 +1284,7 @@ class concurrent_geometric_level_generator {
12841284
} // namespace tbb
12851285

12861286
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
1287-
#pragma warning(pop) // warning 4127 is back
1287+
// #pragma warning(pop) // warning 4127 is back
12881288
#endif
12891289

12901290
#endif // __TBB_detail__concurrent_skip_list_H

‎src/tbb/include/oneapi/tbb/detail/_concurrent_unordered_base.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
#include <algorithm>
4141

4242
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
43-
#pragma warning(push)
44-
#pragma warning(disable: 4127) // warning C4127: conditional expression is constant
43+
// #pragma warning(push)
44+
// #pragma warning(disable: 4127) // warning C4127: conditional expression is constant
4545
#endif
4646

4747
namespace tbb {
@@ -1505,7 +1505,7 @@ bool operator!=( const concurrent_unordered_base<Traits>& lhs,
15051505
#endif
15061506

15071507
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
1508-
#pragma warning(pop) // warning 4127 is back
1508+
// #pragma warning(pop) // warning 4127 is back
15091509
#endif
15101510

15111511
} // namespace d2

‎src/tbb/include/oneapi/tbb/detail/_exception.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ enum class exception_id {
4343
} // namespace d0
4444

4545
#if _MSC_VER
46-
#pragma warning(disable: 4275)
46+
// #pragma warning(disable: 4275)
4747
#endif
4848

4949
namespace r1 {

‎src/tbb/include/oneapi/tbb/detail/_flow_graph_node_impl.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,12 @@ class function_input : public function_input_base<Input, Policy, A, function_inp
486486
}
487487
graph_task* successor_task = successors().try_put_task(v __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo));
488488
#if _MSC_VER && !__INTEL_COMPILER
489-
#pragma warning (push)
490-
#pragma warning (disable: 4127) /* suppress conditional expression is constant */
489+
// #pragma warning (push)
490+
// #pragma warning (disable: 4127) /* suppress conditional expression is constant */
491491
#endif
492492
if(has_policy<lightweight, Policy>::value) {
493493
#if _MSC_VER && !__INTEL_COMPILER
494-
#pragma warning (pop)
494+
// #pragma warning (pop)
495495
#endif
496496
if(!successor_task) {
497497
// Return confirmative status since current
@@ -776,12 +776,12 @@ class continue_input : public continue_receiver {
776776
return nullptr;
777777
}
778778
#if _MSC_VER && !__INTEL_COMPILER
779-
#pragma warning (push)
780-
#pragma warning (disable: 4127) /* suppress conditional expression is constant */
779+
// #pragma warning (push)
780+
// #pragma warning (disable: 4127) /* suppress conditional expression is constant */
781781
#endif
782782
if(has_policy<lightweight, Policy>::value) {
783783
#if _MSC_VER && !__INTEL_COMPILER
784-
#pragma warning (pop)
784+
// #pragma warning (pop)
785785
#endif
786786
return apply_body_bypass( continue_msg() __TBB_FLOW_GRAPH_METAINFO_ARG(metainfo) );
787787
}

‎src/tbb/include/oneapi/tbb/detail/_flow_graph_types_impl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ template <typename... Types>
9595
using max_alignment_helper_t = typename max_alignment_helper<Types...>::type;
9696

9797
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
98-
#pragma warning(push)
99-
#pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
98+
// #pragma warning(push)
99+
// #pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
100100
#endif
101101

102102
// T1, T2 are actual types stored. The space defined for T1 in the type returned
@@ -120,7 +120,7 @@ struct alignas(alignof(max_alignment_helper_t<T1, T2, T3>)) aligned_triple {
120120

121121

122122
#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
123-
#pragma warning(pop) // warning 4324 is back
123+
// #pragma warning(pop) // warning 4324 is back
124124
#endif
125125

126126
// support for variant type

0 commit comments

Comments
 (0)