Move llvm/Support/MDBuilder.h to llvm/MDBuilder.h, to live with

[oota-llvm.git] / include / llvm / Support / AlignOf.h

diff --git a/include/llvm/Support/AlignOf.h b/include/llvm/Support/AlignOf.h
index b63e75fd662dd1ba40a7d76f98ed7c77fd345f9b..85607c84482c200a81579377864dbee3d57d9e9b 100644 (file)
--- a/include/llvm/Support/AlignOf.h
+++ b/include/llvm/Support/AlignOf.h
@@ -57,7 +57,7 @@ struct AlignOf {
 ///  class besides some cosmetic cleanliness.  Example usage:
 ///  alignOf<int>() returns the alignment of an int.
 template <typename T>
-static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+inline unsigned alignOf() { return AlignOf<T>::Alignment; }
 
 
 /// \brief Helper for building an aligned character array type.
@@ -72,7 +72,7 @@ template <size_t Alignment> struct AlignedCharArrayImpl {};
 template <> struct AlignedCharArrayImpl<0> {
   typedef char type;
 };
-#if __cplusplus == 201103L || __has_feature(cxx_alignas)
+#if __has_feature(cxx_alignas)
 #define LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(x) \
   template <> struct AlignedCharArrayImpl<x> { \
     typedef char alignas(x) type; \