From ee0db89aee85f5f1bb0ca659bf5bd92a417e1e6b Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 7 Oct 2016 22:10:35 +0000 Subject: [PATCH] Fix shadow warnings. Patch from STL@microsoft.com git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@283618 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../utilities/utility/forward/move.pass.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/std/utilities/utility/forward/move.pass.cpp b/test/std/utilities/utility/forward/move.pass.cpp index 9dfebcc5c..e2edc2a2a 100644 --- a/test/std/utilities/utility/forward/move.pass.cpp +++ b/test/std/utilities/utility/forward/move.pass.cpp @@ -52,12 +52,12 @@ struct A { constexpr bool test_constexpr_move() { #if TEST_STD_VER > 11 - int x = 42; - const int cx = x; - return std::move(x) == 42 - && std::move(cx) == 42 - && std::move(static_cast(x)) == 42 - && std::move(static_cast(x)) == 42; + int y = 42; + const int cy = y; + return std::move(y) == 42 + && std::move(cy) == 42 + && std::move(static_cast(y)) == 42 + && std::move(static_cast(y)) == 42; #else return true; #endif @@ -105,8 +105,8 @@ int main() } #if TEST_STD_VER > 11 { - constexpr int x = 42; - static_assert(std::move(x) == 42, ""); + constexpr int y = 42; + static_assert(std::move(y) == 42, ""); static_assert(test_constexpr_move(), ""); } #endif @@ -114,8 +114,8 @@ int main() // Test that std::forward is constexpr in C++11. This is an extension // provided by both libc++ and libstdc++. { - constexpr int x = 42; - static_assert(std::move(x) == 42, ""); + constexpr int y = 42; + static_assert(std::move(y) == 42, ""); } #endif }