update to C++14 for cov and Linux.x86 targets. (#465)

bakerstu · Nov 21, 2020 · c044aed · c044aed
1 parent 51b6cfb
commit c044aed
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/etc/cov.mk b/etc/cov.mk
@@ -30,7 +30,7 @@ CSHAREDFLAGS = -c -frandom-seed=$(shell echo $(abspath $<) | md5sum  | sed 's/\(
 
 CFLAGS = $(CSHAREDFLAGS) -std=gnu99 $(CFLAGSEXTRA)
 
-CXXFLAGS = $(CSHAREDFLAGS) -std=c++1y -D__STDC_FORMAT_MACROS \
+CXXFLAGS = $(CSHAREDFLAGS) -std=c++14 -D__STDC_FORMAT_MACROS \
            -D__STDC_LIMIT_MACROS $(CXXFLAGSEXTRA) #-D__LINEAR_MAP__
 
 

diff --git a/etc/linux.x86.mk b/etc/linux.x86.mk
@@ -35,7 +35,7 @@ CFLAGS = $(CSHAREDFLAGS) -std=gnu99 \
          $(CFLAGSENV) $(CFLAGSEXTRA) \
 
 
-CXXFLAGS = $(CSHAREDFLAGS) -std=c++0x -D__STDC_FORMAT_MACROS \
+CXXFLAGS = $(CSHAREDFLAGS) -std=c++14 -D__STDC_FORMAT_MACROS \
            -D__STDC_LIMIT_MACROS $(CXXFLAGSENV) \
            $(CXXFLAGSENV) $(CXXFLAGSEXTRA) \
 

diff --git a/src/utils/StoredBitSet.cxxtest b/src/utils/StoredBitSet.cxxtest
@@ -54,7 +54,7 @@ TEST(ShadowedBitSetSingleTest, size)
 }
 
 class BitSetMultiTest
-    : public ::testing::TestWithParam<std::tr1::tuple<unsigned, int>>
+    : public ::testing::TestWithParam<std::tuple<unsigned, int>>
 {
 protected:
     BitSetMultiTest()
@@ -63,11 +63,11 @@ protected:
 
     unsigned get_size()
     {
-        return std::tr1::get<0>(GetParam());
+        return std::get<0>(GetParam());
     }
     uint8_t get_granularity()
     {
-        return std::tr1::get<1>(GetParam());
+        return std::get<1>(GetParam());
     }
 
 #define expect_all_zero(x...)                                                  \