diff --git a/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp b/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp index 57d4a3834..179e5e762 100644 --- a/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp +++ b/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 static two test(...); - template static char test(typename _Up::value_type* = 0); + template static two test(...); + template static char test(typename U::value_type* = 0); public: static const bool value = sizeof(test(0)) == 1; }; diff --git a/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp b/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp index 19de6f7f0..fce826f42 100644 --- a/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp +++ b/test/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template static __two __test(...); - template static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template static two test(...); + template static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test(0)) == 1; + static const bool value = sizeof(test(0)) == 1; }; diff --git a/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp b/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp index 0b9796027..bcd353eba 100644 --- a/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp +++ b/test/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template static __two __test(...); - template static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template static two test(...); + template static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test(0)) == 1; + static const bool value = sizeof(test(0)) == 1; }; diff --git a/test/std/utilities/function.objects/comparisons/transparent.pass.cpp b/test/std/utilities/function.objects/comparisons/transparent.pass.cpp index 40b0f5e07..ebae262b2 100644 --- a/test/std/utilities/function.objects/comparisons/transparent.pass.cpp +++ b/test/std/utilities/function.objects/comparisons/transparent.pass.cpp @@ -15,11 +15,11 @@ template struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template static __two __test(...); - template static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template static two test(...); + template static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test(0)) == 1; + static const bool value = sizeof(test(0)) == 1; }; diff --git a/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp b/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp index b915863f2..d64c02f97 100644 --- a/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp +++ b/test/std/utilities/function.objects/logical.operations/transparent.pass.cpp @@ -15,11 +15,11 @@ template struct is_transparent { private: - struct __two {char __lx; char __lxx;}; - template static __two __test(...); - template static char __test(typename _Up::is_transparent* = 0); + struct two {char lx; char lxx;}; + template static two test(...); + template static char test(typename U::is_transparent* = 0); public: - static const bool value = sizeof(__test(0)) == 1; + static const bool value = sizeof(test(0)) == 1; };