diff --git a/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp b/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp index 2226ac723..4964e8e88 100644 --- a/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp +++ b/test/std/numerics/numeric.ops/transform.exclusive.scan/transform_exclusive_scan_init_bop_uop.pass.cpp @@ -28,17 +28,17 @@ template struct identity : std::unary_function { - constexpr const T& operator()(const T& __x) const { return __x;} + constexpr const T& operator()(const T& x) const { return x;} }; template <> struct identity { template - constexpr auto operator()(T&& __x) const - _NOEXCEPT_(noexcept(_VSTD::forward(__x))) - -> decltype (_VSTD::forward(__x)) - { return _VSTD::forward(__x); } + constexpr auto operator()(T&& x) const + _NOEXCEPT_(noexcept(_VSTD::forward(x))) + -> decltype (_VSTD::forward(x)) + { return _VSTD::forward(x); } }; template diff --git a/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp b/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp index 246467bfc..d15defc2c 100644 --- a/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp +++ b/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop.pass.cpp @@ -1,3 +1,4 @@ + //===----------------------------------------------------------------------===// // // The LLVM Compiler Infrastructure @@ -28,17 +29,17 @@ template struct identity : std::unary_function { - constexpr const T& operator()(const T& __x) const { return __x;} + constexpr const T& operator()(const T& x) const { return x;} }; template <> struct identity { template - constexpr auto operator()(T&& __x) const - _NOEXCEPT_(noexcept(_VSTD::forward(__x))) - -> decltype (_VSTD::forward(__x)) - { return _VSTD::forward(__x); } + constexpr auto operator()(T&& x) const + _NOEXCEPT_(noexcept(_VSTD::forward(x))) + -> decltype (_VSTD::forward(x)) + { return _VSTD::forward(x); } }; template diff --git a/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp b/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp index 453e0367a..b38b9a5af 100644 --- a/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp +++ b/test/std/numerics/numeric.ops/transform.inclusive.scan/transform_inclusive_scan_bop_uop_init.pass.cpp @@ -28,17 +28,17 @@ template struct identity : std::unary_function { - constexpr const T& operator()(const T& __x) const { return __x;} + constexpr const T& operator()(const T& x) const { return x;} }; template <> struct identity { template - constexpr auto operator()(T&& __x) const - _NOEXCEPT_(noexcept(_VSTD::forward(__x))) - -> decltype (_VSTD::forward(__x)) - { return _VSTD::forward(__x); } + constexpr auto operator()(T&& x) const + _NOEXCEPT_(noexcept(_VSTD::forward(x))) + -> decltype (_VSTD::forward(x)) + { return _VSTD::forward(x); } }; template diff --git a/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp b/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp index b648aa528..418c57f7c 100644 --- a/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp +++ b/test/std/numerics/numeric.ops/transform.reduce/transform_reduce_iter_iter_init_bop_uop.pass.cpp @@ -24,34 +24,34 @@ template struct identity : std::unary_function { - constexpr const T& operator()(const T& __x) const { return __x;} + constexpr const T& operator()(const T& x) const { return x;} }; template <> struct identity { template - constexpr auto operator()(T&& __x) const - _NOEXCEPT_(noexcept(_VSTD::forward(__x))) - -> decltype (_VSTD::forward(__x)) - { return _VSTD::forward(__x); } + constexpr auto operator()(T&& x) const + _NOEXCEPT_(noexcept(_VSTD::forward(x))) + -> decltype (_VSTD::forward(x)) + { return _VSTD::forward(x); } }; template struct twice { - constexpr const T operator()(const T& __x) const noexcept { return 2 * __x; } + constexpr const T operator()(const T& x) const noexcept { return 2 * x; } }; template <> struct twice { template - constexpr auto operator()(const T& __x) const - _NOEXCEPT_(noexcept(2 * __x)) - -> decltype (2 * __x) - { return 2 * __x; } + constexpr auto operator()(const T& x) const + _NOEXCEPT_(noexcept(2 * x)) + -> decltype (2 * x) + { return 2 * x; } }; template