diff --git a/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp b/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp index 16fc85fd9..2d5e1843f 100644 --- a/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp +++ b/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp @@ -41,9 +41,6 @@ struct throw_hasher throw_hasher(bool& should_throw) : should_throw_(should_throw) {} - typedef size_t result_type; - typedef T argument_type; - size_t operator()(const T& p) const { if (should_throw_) @@ -99,8 +96,6 @@ int main() struct hasher { hasher() = default; - typedef Counter argument_type; - typedef size_t result_type; size_t operator()(const Counter& p) const { return std::hash>()(p); diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp index 5c75d7792..b7f61ca5a 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp @@ -41,9 +41,6 @@ struct throw_hasher throw_hasher(bool& should_throw) : should_throw_(should_throw) {} - typedef size_t result_type; - typedef T argument_type; - size_t operator()(const T& p) const { if (should_throw_) @@ -99,8 +96,6 @@ int main() struct hasher { hasher() = default; - typedef Counter argument_type; - typedef size_t result_type; size_t operator()(const Counter& p) const { return std::hash>()(p); diff --git a/test/std/containers/unord/unord.multiset/merge.pass.cpp b/test/std/containers/unord/unord.multiset/merge.pass.cpp index abf8aa57d..7913f9564 100644 --- a/test/std/containers/unord/unord.multiset/merge.pass.cpp +++ b/test/std/containers/unord/unord.multiset/merge.pass.cpp @@ -41,9 +41,6 @@ struct throw_hasher throw_hasher(bool& should_throw) : should_throw_(should_throw) {} - typedef size_t result_type; - typedef T argument_type; - size_t operator()(const T& p) const { if (should_throw_) @@ -99,8 +96,6 @@ int main() struct hasher { hasher() = default; - typedef Counter argument_type; - typedef size_t result_type; size_t operator()(const Counter& p) const { return std::hash>()(p); } }; { diff --git a/test/std/containers/unord/unord.set/merge.pass.cpp b/test/std/containers/unord/unord.set/merge.pass.cpp index 973d2d93c..519d7f138 100644 --- a/test/std/containers/unord/unord.set/merge.pass.cpp +++ b/test/std/containers/unord/unord.set/merge.pass.cpp @@ -41,9 +41,6 @@ struct throw_hasher throw_hasher(bool& should_throw) : should_throw_(should_throw) {} - typedef size_t result_type; - typedef T argument_type; - size_t operator()(const T& p) const { if (should_throw_) @@ -99,8 +96,6 @@ int main() struct hasher { hasher() = default; - typedef Counter argument_type; - typedef size_t result_type; size_t operator()(const Counter& p) const { return std::hash>()(p); } }; {