RcppCore
diff --git a/‎DESCRIPTION
Copy file name to clipboardExpand all lines: DESCRIPTION
+1-1Lines changed: 1 addition & 1 deletion b/‎DESCRIPTION
Copy file name to clipboardExpand all lines: DESCRIPTION
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎inst/NEWS
Copy file name to clipboardExpand all lines: inst/NEWS
+5Lines changed: 5 additions & 0 deletions b/‎inst/NEWS
Copy file name to clipboardExpand all lines: inst/NEWS
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/options.cpp
Copy file name to clipboardExpand all lines: src/options.cpp
+10-12Lines changed: 10 additions & 12 deletions b/‎src/options.cpp
Copy file name to clipboardExpand all lines: src/options.cpp
+10-12Lines changed: 10 additions & 12 deletions
@@ -1,7 +1,7 @@
 Package: RcppParallel
 Type: Package
 Title: Parallel Programming Tools for 'Rcpp'
-Version: 5.0.1
+Version: 5.0.1-9000
 Authors@R: c(
     person("JJ", "Allaire", role = c("aut"), email = "jj@rstudio.com"),
     person("Romain", "Francois", role = c("aut", "cph")),
 
@@ -1,3 +1,8 @@
+RcppParallel 5.0.2 (UNRELEASED)
+------------------------------------------------------------------------
+* Subsequent calls to setThreadOptions(...) are now ignored, to avoid
+  segfaults when compiling RcppParallel / TBB with gcc 10.1.
+
 RcppParallel 5.0.1
 ------------------------------------------------------------------------
 * Fixed compilation issue on OpenSUSE Tumbleweed with -flto=auto
 
@@ -13,30 +13,28 @@
 extern "C" SEXP setThreadOptions(SEXP numThreadsSEXP, SEXP stackSizeSEXP) {
 
    static tbb::task_scheduler_init* s_pTaskScheduler = NULL;
+   if (s_pTaskScheduler != NULL)
+      return Rf_ScalarLogical(0);
 
    int numThreads = Rf_asInteger(numThreadsSEXP);
-   
    int stackSize = Rf_asInteger(stackSizeSEXP);
-   
+
    try
    {
-      if (!s_pTaskScheduler) {
-         s_pTaskScheduler = new tbb::task_scheduler_init(numThreads, stackSize);
-      } else {
-         s_pTaskScheduler->terminate();
-         s_pTaskScheduler->initialize(numThreads, stackSize); 
-      }
+      s_pTaskScheduler = new tbb::task_scheduler_init(numThreads, stackSize);
    }
    catch(const std::exception& e)
    {
-      Rf_error(("Error loading TBB: " + std::string(e.what())).c_str());
+      const char* fmt = "Error loading TBB: %s\n";
+      Rf_error(fmt, e.what());
    }
    catch(...)
    {
-      Rf_error("Error loading TBB: (Unknown error)");
+      const char* fmt = "Error loading TBB: %s\n";
+      Rf_error(fmt, "(Unknown error)");
    }
-   
-   return R_NilValue;
+
+   return Rf_ScalarLogical(1);
 }
 
 extern "C" SEXP defaultNumThreads() {
Original file line number	Diff line number	Diff line change
`@@ -13,30 +13,28 @@`
`13`	`13`	`extern "C" SEXP setThreadOptions(SEXP numThreadsSEXP, SEXP stackSizeSEXP) {`
`14`	`14`
`15`	`15`	`static tbb::task_scheduler_init* s_pTaskScheduler = NULL;`
	`16`	`+ if (s_pTaskScheduler != NULL)`
	`17`	`+ return Rf_ScalarLogical(0);`
`16`	`18`
`17`	`19`	`int numThreads = Rf_asInteger(numThreadsSEXP);`
`18`		`-`
`19`	`20`	`int stackSize = Rf_asInteger(stackSizeSEXP);`
`20`		`-`
	`21`	`+`
`21`	`22`	`try`
`22`	`23`	`{`
`23`		`- if (!s_pTaskScheduler) {`
`24`		`- s_pTaskScheduler = new tbb::task_scheduler_init(numThreads, stackSize);`
`25`		`- } else {`
`26`		`- s_pTaskScheduler->terminate();`
`27`		`- s_pTaskScheduler->initialize(numThreads, stackSize);`
`28`		`- }`
	`24`	`+ s_pTaskScheduler = new tbb::task_scheduler_init(numThreads, stackSize);`
`29`	`25`	`}`
`30`	`26`	`catch(const std::exception& e)`
`31`	`27`	`{`
`32`		`- Rf_error(("Error loading TBB: " + std::string(e.what())).c_str());`
	`28`	`+ const char* fmt = "Error loading TBB: %s\n";`
	`29`	`+ Rf_error(fmt, e.what());`
`33`	`30`	`}`
`34`	`31`	`catch(...)`
`35`	`32`	`{`
`36`		`- Rf_error("Error loading TBB: (Unknown error)");`
	`33`	`+ const char* fmt = "Error loading TBB: %s\n";`
	`34`	`+ Rf_error(fmt, "(Unknown error)");`
`37`	`35`	`}`
`38`		`-`
`39`		`- return R_NilValue;`
	`36`	`+`
	`37`	`+ return Rf_ScalarLogical(1);`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`extern "C" SEXP defaultNumThreads() {`