use more modern cpp standard where available

Author: jjallaire

R/build.R

@@ -28,10 +28,7 @@ inlineCxxPlugin <- function() {
 }
 
 tbbCxxFlags <- function() {
-   if (Sys.info()['sysname'] != "SunOS")
-      flags <- "-Wno-long-long"
-   else
-      flags <- ""
+   flags <- "$(CXX1XSTD)"
    if (Sys.info()['sysname'] == "Windows")
       flags <- paste(flags, "-DRCPP_PARALLEL_USE_TBB=1")
    flags

src/Makevars

@@ -1,11 +1,10 @@
 
-PKG_CPPFLAGS += -I../inst/include/
+PKG_CPPFLAGS += $(CXX1XSTD) -I../inst/include/ 
 
 ifeq ($(OS), Windows_NT)
 
   USE_TBB=Windows
   TBB_COPY_PATTERN=tbb*.dll
-  PKG_CPPFLAGS += -Wno-long-long
 
 else
 
@@ -19,8 +18,6 @@ else
   endif
   ifeq ($(UNAME), SunOS)
     USE_TBB=SunOS
-  else
-    PKG_CPPFLAGS += -Wno-long-long
   endif
 
 endif
@@ -66,9 +63,9 @@ tbb:
 	mkdir -p ../inst/lib/$(ARCH_DIR); \
 	cd tbb/src; \
 	if [[ "$(CC)" == clang* ]]; then \
-	   make compiler=clang $(MAKE_ARGS); \
+	   make cpp0x=1 compiler=clang $(MAKE_ARGS); \
 	else \
-	   make $(MAKE_ARGS); \
+	   make cpp0x=1 $(MAKE_ARGS); \
 	fi; \
 	cd ../..; \
 	cp tbb/build/lib_release/$(TBB_COPY_PATTERN) ../inst/lib/$(ARCH_DIR)

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-long-long
+WARNING_SUPPRESS = -Wno-parentheses -Wno-non-virtual-dtor -Wno-dangling-else
 DYLIB_KEY = -shared
 EXPORT_KEY = -Wl,--version-script,
 LIBDL = -ldl