more warnings work

jjallaire · jjallaire · commit 768c7b1b05db · 2015-04-11T14:59:44.000-04:00
diff --git a/R/build.R b/R/build.R
@@ -28,10 +28,10 @@ inlineCxxPlugin <- function() {
 }
 
 tbbCxxFlags <- function() {
+   flags <- "-Wno-long-long"
    if (Sys.info()['sysname'] == "Windows")
-      "-DRCPP_PARALLEL_USE_TBB=1"
-   else
-      ""
+      flags <- paste(flags, "-DRCPP_PARALLEL_USE_TBB=1")
+   flags
 }
 
 # Return the linker flags requried for TBB on this platform
diff --git a/src/tbb/build/linux.clang.inc b/src/tbb/build/linux.clang.inc
@@ -26,7 +26,7 @@ PIC_KEY = -fPIC
 WARNING_AS_ERROR_KEY = -Werror
 WARNING_KEY = -Wall
 TEST_WARNING_KEY = -Wextra -Wshadow -Wcast-qual -Woverloaded-virtual -Wnon-virtual-dtor
-WARNING_SUPPRESS = -Wno-parentheses -Wno-non-virtual-dtor -Wno-dangling-else -Wno-c++11-long-long
+WARNING_SUPPRESS = -Wno-parentheses -Wno-non-virtual-dtor -Wno-dangling-else -Wno-long-long
 DYLIB_KEY = -shared
 EXPORT_KEY = -Wl,--version-script,
 LIBDL = -ldl

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,10 @@ inlineCxxPlugin <- function() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`tbbCxxFlags <- function() {`
	`31`	`+ flags <- "-Wno-long-long"`
`31`	`32`	`if (Sys.info()['sysname'] == "Windows")`
`32`		`- "-DRCPP_PARALLEL_USE_TBB=1"`
`33`		`- else`
`34`		`- ""`
	`33`	`+ flags <- paste(flags, "-DRCPP_PARALLEL_USE_TBB=1")`
	`34`	`+ flags`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`# Return the linker flags requried for TBB on this platform`