summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-03-22 21:17:07 +0000
committerEric Fiselier <eric@efcs.ca>2018-03-22 21:17:07 +0000
commitf3d421280bf7770e43ff56a2a518b71304ee0e16 (patch)
treefa455f25a794d771d1c45dca2bf623ec4cf6230c
parentf6688124b95fe1d8d75c0f44be797bc9a83a5a80 (diff)
downloadbcm5719-llvm-f3d421280bf7770e43ff56a2a518b71304ee0e16.tar.gz
bcm5719-llvm-f3d421280bf7770e43ff56a2a518b71304ee0e16.zip
Fix test failure on Windows caused by different underlying enumeration type rules
llvm-svn: 328243
-rw-r--r--clang/test/SemaCXX/builtin-operator-new-delete.cpp8
1 files 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 fb5e9a48574..40d47329eff 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;
OpenPOWER on IntegriCloud