summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2013-10-21 04:59:37 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2013-10-21 04:59:37 +0000
commit1483143e7aa95ed618e69fccd38e32f8250bcad0 (patch)
tree4fa38263662dbb4d25356d76711bf9c5e03d185d
parent67900f0c63b04ef44ce40c7cef4e7fec64c3465b (diff)
downloadbcm5719-llvm-1483143e7aa95ed618e69fccd38e32f8250bcad0.tar.gz
bcm5719-llvm-1483143e7aa95ed618e69fccd38e32f8250bcad0.zip
Avoid using the name 'bzero' for an enumerator in global scope. <strings.h> might declare this as a function.
llvm-svn: 193066
-rw-r--r--libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp2
-rw-r--r--libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
index 6e265a05a8d..2dd4d9ac97c 100644
--- a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
+++ b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp
@@ -17,7 +17,7 @@ enum Enum {zero, one_};
enum BigEnum
{
- bzero,
+ bigzero,
big = 0xFFFFFFFFFFFFFFFFULL
};
diff --git a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
index 5e432b5231d..6700b6cbb95 100644
--- a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
+++ b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp
@@ -17,7 +17,7 @@ enum Enum {zero, one_};
enum BigEnum
{
- bzero,
+ bigzero,
big = 0xFFFFFFFFFFFFFFFFULL
};
OpenPOWER on IntegriCloud