summaryrefslogtreecommitdiffstats
path: root/libcxx/utils/google-benchmark/include/benchmark/macros.h
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/utils/google-benchmark/include/benchmark/macros.h')
-rw-r--r--libcxx/utils/google-benchmark/include/benchmark/macros.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/libcxx/utils/google-benchmark/include/benchmark/macros.h b/libcxx/utils/google-benchmark/include/benchmark/macros.h
index 09d13c19a44..5892ac425cc 100644
--- a/libcxx/utils/google-benchmark/include/benchmark/macros.h
+++ b/libcxx/utils/google-benchmark/include/benchmark/macros.h
@@ -14,7 +14,11 @@
#ifndef BENCHMARK_MACROS_H_
#define BENCHMARK_MACROS_H_
-#if __cplusplus < 201103L
+#if __cplusplus >= 201103L
+#define BENCHMARK_HAS_CXX11
+#endif
+
+#ifndef BENCHMARK_HAS_CXX11
# define BENCHMARK_DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
TypeName& operator=(const TypeName&)
@@ -53,4 +57,8 @@
# define BENCHMARK_BUILTIN_EXPECT(x, y) x
#endif
+#if defined(__GNUC__) && !defined(__clang__)
+#define BENCHMARK_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
+#endif
+
#endif // BENCHMARK_MACROS_H_
OpenPOWER on IntegriCloud