From f3d421280bf7770e43ff56a2a518b71304ee0e16 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Thu, 22 Mar 2018 21:17:07 +0000
Subject: [PATCH] Fix test failure on Windows caused by different underlying
 enumeration type rules

llvm-svn: 328243
---
 clang/test/SemaCXX/builtin-operator-new-delete.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/clang/test/SemaCXX/builtin-operator-new-delete.cpp b/clang/test/SemaCXX/builtin-operator-new-delete.cpp
index fb5e9a485745..40d47329effb 100644
--- a/clang/test/SemaCXX/builtin-operator-new-delete.cpp
+++ b/clang/test/SemaCXX/builtin-operator-new-delete.cpp
@@ -19,8 +19,12 @@ namespace std {
 #if __cplusplus >= 201103L
 enum class align_val_t : size_t {};
 #else
-  enum align_val_t { __zero = 0,
-                     __max = (size_t)-1 };
+  enum align_val_t {
+  // We can't force an underlying type when targeting windows.
+# ifndef _WIN32
+    __zero = 0, __max = (size_t)-1
+# endif
+  };
 #endif
 }
 std::nothrow_t nothrow;
-- 
2.34.1