From 27c86f29417e53a622a2902baab2d1d82dafc5f9 Mon Sep 17 00:00:00 2001 From: misterg Date: Mon, 8 Oct 2018 10:42:22 -0400 Subject: always define define GTEST_LANG_CXX11 1 PiperOrigin-RevId: 216184859 --- googletest/include/gtest/internal/gtest-port.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 899fa5bc..ad56d079 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -343,18 +343,7 @@ GTEST_DISABLE_MSC_WARNINGS_POP_() #endif -#ifndef GTEST_LANG_CXX11 -// gcc and clang define __GXX_EXPERIMENTAL_CXX0X__ when -// -std={c,gnu}++{0x,11} is passed. The C++11 standard specifies a -// value for __cplusplus, and recent versions of clang, gcc, and -// probably other compilers set that too in C++11 mode. -# if __GXX_EXPERIMENTAL_CXX0X__ || __cplusplus >= 201103L || _MSC_VER >= 1900 -// Compiling in at least C++11 mode. -# define GTEST_LANG_CXX11 1 -# else -# define GTEST_LANG_CXX11 0 -# endif -#endif +#define GTEST_LANG_CXX11 1 // Distinct from C++11 language support, some environments don't provide // proper C++11 library support. Notably, it's possible to build in -- cgit v1.2.3