Browse Source

Rolls back C++ version to c++1y

Caleb Fangmeier 6 years ago
parent
commit
aeabde563f
2 changed files with 2 additions and 2 deletions
  1. 1 1
      cmake/FindROOT.cmake
  2. 1 1
      filval

+ 1 - 1
cmake/FindROOT.cmake

@@ -104,7 +104,7 @@ ELSE(WIN32)
     STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+" "\\1" ROOT_MAJOR_VER "${ROOTVERSION}")
     IF(ROOT_MAJOR_VER EQUAL 6)
       MESSAGE("-- ROOT 6 detected - requiring C++11")
-      ADD_DEFINITIONS("-std=c++1z -DROOT_MAJOR_VER=6")
+      ADD_DEFINITIONS("-std=c++1y -DROOT_MAJOR_VER=6")
     ENDIF(ROOT_MAJOR_VER EQUAL 6)
 
     # ask root-config for the library dir

+ 1 - 1
filval

@@ -1 +1 @@
-Subproject commit 836549f3ab05b16cd5fb86747581345f5657cd03
+Subproject commit d6be1127b86e32ccba6eee547a7b2e42dda7cbf7