1 files changed, 4 insertions, 6 deletions
diff --git a/clang/include/clang/CodeGen/ConstantInitFuture.h b/clang/include/clang/CodeGen/ConstantInitFuture.h
index b08f528722906..452ba36d20876 100644
--- a/clang/include/clang/CodeGen/ConstantInitFuture.h
+++ b/clang/include/clang/CodeGen/ConstantInitFuture.h
@@ -35,7 +35,7 @@ struct PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitBuilderBase*> {
 
   static inline void *getAsVoidPointer(T p) { return p; }
   static inline T getFromVoidPointer(void *p) {return static_cast<T>(p);}
-  enum { NumLowBitsAvailable = 2 };
+  static constexpr int NumLowBitsAvailable = 2;
 };
 }
 
@@ -79,10 +79,8 @@ public:
     result.Data = PairTy::getFromOpaqueValue(value);
     return result;
   }
-  enum {
-    NumLowBitsAvailable =
-      llvm::PointerLikeTypeTraits<PairTy>::NumLowBitsAvailable
-  };
+  static constexpr int NumLowBitsAvailable =
+      llvm::PointerLikeTypeTraits<PairTy>::NumLowBitsAvailable;
 };
 
 }  // end namespace CodeGen
@@ -100,7 +98,7 @@ struct PointerLikeTypeTraits< ::clang::CodeGen::ConstantInitFuture> {
   static inline T getFromVoidPointer(void *p) {
     return T::getFromOpaqueValue(p);
   }
-  enum { NumLowBitsAvailable = T::NumLowBitsAvailable };
+  static constexpr int NumLowBitsAvailable = T::NumLowBitsAvailable;
 };
 
 } // end namespace llvm