From f3229da836ede5bc0efd2a51531b27ac9c0bb1c0 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 23 Apr 2012 20:51:21 +0000 Subject: [PATCH] Hash: fix tests for older C++0x libraries. [SVN r78165] --- test/hash_std_array_test.cpp | 24 ++++++++++++------------ test/hash_std_tuple_test.cpp | 14 +++++++------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/test/hash_std_array_test.cpp b/test/hash_std_array_test.cpp index 5e8a3d4..540b676 100644 --- a/test/hash_std_array_test.cpp +++ b/test/hash_std_array_test.cpp @@ -50,11 +50,11 @@ void int_1_array_test() std::vector > arrays; std::array val; val[0] = 0; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = 1; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = 2; - arrays.emplace_back(val); + arrays.push_back(val); array_tests(arrays); } @@ -62,11 +62,11 @@ void string_1_array_test() { std::vector > arrays; std::array val; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = "one"; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = "two"; - arrays.emplace_back(val); + arrays.push_back(val); array_tests(arrays); } @@ -74,17 +74,17 @@ void string_3_array_test() { std::vector > arrays; std::array val; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = "one"; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = ""; val[1] = "one"; val[2] = ""; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = ""; val[1] = ""; val[2] = "one"; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = "one"; val[1] = "one"; val[2] = "one"; - arrays.emplace_back(val); + arrays.push_back(val); val[0] = "one"; val[1] = "two"; val[2] = "three"; - arrays.emplace_back(val); + arrays.push_back(val); array_tests(arrays); } diff --git a/test/hash_std_tuple_test.cpp b/test/hash_std_tuple_test.cpp index 84aae75..15ef483 100644 --- a/test/hash_std_tuple_test.cpp +++ b/test/hash_std_tuple_test.cpp @@ -53,13 +53,13 @@ void int_tuple_test() { void int_string_tuple_test() { std::vector > int_string_tuples; - int_string_tuples.push_back(std::make_tuple(0, "zero")); - int_string_tuples.push_back(std::make_tuple(1, "one")); - int_string_tuples.push_back(std::make_tuple(2, "two")); - int_string_tuples.push_back(std::make_tuple(0, "one")); - int_string_tuples.push_back(std::make_tuple(1, "zero")); - int_string_tuples.push_back(std::make_tuple(0, "")); - int_string_tuples.push_back(std::make_tuple(1, "")); + int_string_tuples.push_back(std::make_tuple(0, std::string("zero"))); + int_string_tuples.push_back(std::make_tuple(1, std::string("one"))); + int_string_tuples.push_back(std::make_tuple(2, std::string("two"))); + int_string_tuples.push_back(std::make_tuple(0, std::string("one"))); + int_string_tuples.push_back(std::make_tuple(1, std::string("zero"))); + int_string_tuples.push_back(std::make_tuple(0, std::string(""))); + int_string_tuples.push_back(std::make_tuple(1, std::string(""))); tuple_tests(int_string_tuples); }