diff options
author | Derek Schuff <dschuff@chromium.org> | 2013-01-31 10:07:41 -0800 |
---|---|---|
committer | Derek Schuff <dschuff@chromium.org> | 2013-01-31 10:07:41 -0800 |
commit | 3d5de9e56f3e5af59772bdf2cbedb0903d938bb8 (patch) | |
tree | 300b7a72c61b009f0122ec1d8a155672c74459fd /include/llvm/Support | |
parent | 659ebb8c18832df528effd5c970bfde7662ea368 (diff) | |
parent | 9ccb76998f741a7d3f0f217392a783dfb99c6e87 (diff) |
Cherry-pick r174067
Diffstat (limited to 'include/llvm/Support')
-rw-r--r-- | include/llvm/Support/Compiler.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index e639a2cfa1..7e855b2f10 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -95,6 +95,12 @@ #define LLVM_OVERRIDE #endif +#if __has_feature(cxx_constexpr) || defined(__GXX_EXPERIMENTAL_CXX0X__) +# define LLVM_CONSTEXPR constexpr +#else +# define LLVM_CONSTEXPR +#endif + /// LLVM_LIBRARY_VISIBILITY - If a class marked with this attribute is linked /// into a shared library, then the class should be private to the library and /// not accessible from outside it. Can also be used to mark variables and |