From 43ed63bc8310758d2a80deecb2e470f383ca5691 Mon Sep 17 00:00:00 2001 From: Pete Cooper Date: Mon, 11 Nov 2013 03:58:00 +0000 Subject: Add LLVM_HAS_INITIALIZER_LISTS for upcoming C++11 support. Use it in ArrayRef git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194362 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/ArrayRef.h | 7 +++++++ include/llvm/Support/Compiler.h | 9 +++++++++ 2 files changed, 16 insertions(+) (limited to 'include/llvm') diff --git a/include/llvm/ADT/ArrayRef.h b/include/llvm/ADT/ArrayRef.h index a0b6eff269..61467e9b21 100644 --- a/include/llvm/ADT/ArrayRef.h +++ b/include/llvm/ADT/ArrayRef.h @@ -83,6 +83,13 @@ namespace llvm { /*implicit*/ LLVM_CONSTEXPR ArrayRef(const T (&Arr)[N]) : Data(Arr), Length(N) {} +#if LLVM_HAS_INITIALIZER_LISTS + /// Construct an ArrayRef from a std::initializer_list. + /*implicit*/ ArrayRef(const std::initializer_list &Vec) + : Data(Vec.begin() == Vec.end() ? (T*)0 : Vec.begin()), + Length(Vec.size()) {} +#endif + /// @} /// @name Simple Operations /// @{ diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index 13920fcc5a..5ce9abc49d 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -403,4 +403,13 @@ # define LLVM_ENUM_INT_TYPE(intty) #endif +/// \brief Does the compiler support generalized initializers (using braced +/// lists and std::initializer_list). +#if (__has_feature(cxx_generalized_initializers) \ +|| defined(__GXX_EXPERIMENTAL_CXX0X__)) +#define LLVM_HAS_INITIALIZER_LISTS 1 +#else +#define LLVM_HAS_INITIALIZER_LISTS 0 +#endif + #endif -- cgit v1.2.3