From e4c649c9fca659fda908b0d4608feedd434b5656 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 20 Nov 2014 10:47:55 -0800 Subject: [PATCH] Add a pre-C++11 constexpr compatibility macro. Needed for cases where something should be constexpr if possible, but not being constexpr is fine if in pre-C++11 code (such as a const static float member variable). Bug: 18466763 Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1 --- include/utils/Compat.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/utils/Compat.h b/include/utils/Compat.h index 20a692070..0df40a15e 100644 --- a/include/utils/Compat.h +++ b/include/utils/Compat.h @@ -43,6 +43,17 @@ static inline ssize_t pread64(int fd, void* buf, size_t nbytes, off64_t offset) # define ZD_TYPE long #endif +/* + * Needed for cases where something should be constexpr if possible, but not + * being constexpr is fine if in pre-C++11 code (such as a const static float + * member variable). + */ +#if __cplusplus >= 201103L +#define CONSTEXPR constexpr +#else +#define CONSTEXPR +#endif + /* * TEMP_FAILURE_RETRY is defined by some, but not all, versions of * . (Alas, it is not as standard as we'd hoped!) So, if it's