Merge pull request opencv#8844 from mshabunin:fix-arm-tbb

alalek · alalek · commit fd7e516b654c · 2017-06-08T02:42:31.000Z
diff --git a/3rdparty/tbb/arm_linux_stub.cpp b/3rdparty/tbb/arm_linux_stub.cpp
@@ -3,8 +3,9 @@
 namespace tbb {
 namespace internal {
 
-void affinity_helper::protect_affinity_mask() {}
+void affinity_helper::protect_affinity_mask(bool) {}
 affinity_helper::~affinity_helper() {}
+void destroy_process_mask() {}
 
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`namespace tbb {`
`4`	`4`	`namespace internal {`
`5`	`5`
`6`		`-void affinity_helper::protect_affinity_mask() {}`
	`6`	`+void affinity_helper::protect_affinity_mask(bool) {}`
`7`	`7`	`affinity_helper::~affinity_helper() {}`
	`8`	`+void destroy_process_mask() {}`
`8`	`9`
`9`	`10`	`}`
`10`	`11`	`}`