Skip to content

Commit dedade1

Browse files
authored
Fix build errors on MinGW and FreeBSD (#1696)
1 parent 61fd1fd commit dedade1

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ if (TARGET TBB::tbb)
540540

541541
tbb_add_test(SUBDIR tbb NAME test_tbb_header DEPENDENCIES TBB::tbb)
542542
target_sources(test_tbb_header PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/tbb/test_tbb_header_secondary.cpp)
543-
if (TBB_OPENMP_FLAG AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(mips)")
543+
if (NOT MINGW AND TBB_OPENMP_FLAG AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(mips)")
544544
tbb_add_test(SUBDIR tbb NAME test_openmp DEPENDENCIES TBB::tbb)
545545

546546
set_target_properties(test_openmp PROPERTIES COMPILE_FLAGS ${TBB_OPENMP_FLAG})

test/tbb/test_eh_thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void limitThreads(size_t limit)
4848
int ret = getrlimit(RLIMIT_NPROC, &rlim);
4949
CHECK_MESSAGE(0 == ret, "getrlimit has returned an error");
5050

51-
rlim.rlim_cur = (rlim.rlim_max == (rlim_t)RLIM_INFINITY) ? limit : utils::min(limit, rlim.rlim_max);
51+
rlim.rlim_cur = (rlim.rlim_max == (rlim_t)RLIM_INFINITY) ? limit : utils::min((rlim_t)limit, rlim.rlim_max);
5252

5353
ret = setrlimit(RLIMIT_NPROC, &rlim);
5454
CHECK_MESSAGE(0 == ret, "setrlimit has returned an error");

test/tbb/test_numa_dist.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2005-2022 Intel Corporation
2+
Copyright (c) 2005-2025 Intel Corporation
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -70,10 +70,12 @@ struct numa {
7070

7171
int TestNumaDistribution(std::vector<DWORD> &validateProcgrp, int additionalParallelism, bool allThreads){
7272
validateProcgrp.resize(GetMaximumProcessorGroupCount());
73-
PROCESSOR_NUMBER proc;
7473
struct numa nodes;
75-
GetThreadIdealProcessorEx(GetCurrentThread(), &proc);
76-
int master_thread_proc_grp = proc.Group;
74+
int master_thread_proc_grp = [&]{
75+
PROCESSOR_NUMBER proc;
76+
GetThreadIdealProcessorEx(GetCurrentThread(), &proc);
77+
return proc.Group;
78+
}();
7779
int requested_parallelism;
7880
if (allThreads)
7981
requested_parallelism = additionalParallelism;

0 commit comments

Comments
 (0)