diff options
5 files changed, 18 insertions, 18 deletions
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp index 57d4a3834a0..179e5e762a9 100644 --- a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp +++ b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp @@ -25,8 +25,8 @@ struct has_value_type { private: struct two {char lx; char lxx;}; - template <class _Up> static two test(...); - template <class _Up> static char test(typename _Up::value_type* = 0); + template <class U> static two test(...); + template <class U> static char test(typename U::value_type* = 0); public: static const bool value = sizeof(test<T>(0)) == 1; }; diff --git a/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp index 19de6f7f0c5..fce826f4215 100644 --- a/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template <class T> struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template <class _Up> static __two __test(...); - template <class _Up> static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template <class U> static two test(...); + template <class U> static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test<T>(0)) == 1; + static const bool value = sizeof(test<T>(0)) == 1; }; diff --git a/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp index 0b9796027e9..bcd353eba1e 100644 --- a/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template <class T> struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template <class _Up> static __two __test(...); - template <class _Up> static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template <class U> static two test(...); + template <class U> static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test<T>(0)) == 1; + static const bool value = sizeof(test<T>(0)) == 1; }; diff --git a/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp index 40b0f5e0752..ebae262b242 100644 --- a/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/comparisons/transparent.pass.cpp @@ -15,11 +15,11 @@ template <class T> struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template <class _Up> static __two __test(...); - template <class _Up> static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template <class U> static two test(...); + template <class U> static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test<T>(0)) == 1; + static const bool value = sizeof(test<T>(0)) == 1; }; diff --git a/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp b/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp index b915863f29c..d64c02f97cd 100644 --- a/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp +++ b/libcxx/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template <class T> struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template <class _Up> static __two __test(...); - template <class _Up> static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template <class U> static two test(...); + template <class U> static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test<T>(0)) == 1; + static const bool value = sizeof(test<T>(0)) == 1; }; |