From a1097faf856707b3953e49ab5ba76677868bee67 Mon Sep 17 00:00:00 2001
From: Stuart Baker <stuart_w_baker@ymail.com>
Date: Fri, 20 Nov 2020 23:04:14 -0600
Subject: [PATCH] update to C++14 for cov and Linux.x86 targets.

---
 etc/cov.mk                     | 2 +-
 etc/linux.x86.mk               | 2 +-
 src/utils/StoredBitSet.cxxtest | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/cov.mk b/etc/cov.mk
index 12082186f..37c865f8c 100644
--- 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
index bd3f9f5e6..27f940908 100644
--- 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
index f0cf54efe..cd67e6212 100644
--- 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...)                                                  \