From ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 Mon Sep 17 00:00:00 2001 From: mitchell Date: Sun, 5 Jan 2020 17:10:23 -0500 Subject: Synchronizing LongTerm3 with default. Ideally this covers anything missed during the backport process. --- test/unit/UnitTester.vcxproj | 2 +- test/unit/makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/unit/UnitTester.vcxproj b/test/unit/UnitTester.vcxproj index c80270618..65a3529fc 100644 --- a/test/unit/UnitTester.vcxproj +++ b/test/unit/UnitTester.vcxproj @@ -163,4 +163,4 @@ - + \ No newline at end of file diff --git a/test/unit/makefile b/test/unit/makefile index 51c4950d5..a9d10f748 100644 --- a/test/unit/makefile +++ b/test/unit/makefile @@ -5,6 +5,8 @@ # clang works only with libc++, not libstdc++ # Tested with clang 3.3 and g++ 4.8 +CXXSTD=c++11 + ifndef windir ifeq ($(shell uname),Darwin) # On OS X always use clang as g++ is old version @@ -13,7 +15,7 @@ USELIBCPP = 1 endif endif -CXXFLAGS += --std=c++11 +CXXFLAGS += --std=$(CXXSTD) ifdef CLANG CXX = clang++ -- cgit v1.2.3