Hash: fix tests for older C++0x libraries.

[SVN r78165]
This commit is contained in:
Daniel James
2012-04-23 20:51:21 +00:00
parent 441cea413d
commit f3229da836
2 changed files with 19 additions and 19 deletions

View File

@@ -50,11 +50,11 @@ void int_1_array_test()
std::vector<std::array<int, 1> > arrays; std::vector<std::array<int, 1> > arrays;
std::array<int, 1> val; std::array<int, 1> val;
val[0] = 0; val[0] = 0;
arrays.emplace_back(val); arrays.push_back(val);
val[0] = 1; val[0] = 1;
arrays.emplace_back(val); arrays.push_back(val);
val[0] = 2; val[0] = 2;
arrays.emplace_back(val); arrays.push_back(val);
array_tests(arrays); array_tests(arrays);
} }
@@ -62,11 +62,11 @@ void string_1_array_test()
{ {
std::vector<std::array<std::string, 1> > arrays; std::vector<std::array<std::string, 1> > arrays;
std::array<std::string, 1> val; std::array<std::string, 1> val;
arrays.emplace_back(val); arrays.push_back(val);
val[0] = "one"; val[0] = "one";
arrays.emplace_back(val); arrays.push_back(val);
val[0] = "two"; val[0] = "two";
arrays.emplace_back(val); arrays.push_back(val);
array_tests(arrays); array_tests(arrays);
} }
@@ -74,17 +74,17 @@ void string_3_array_test()
{ {
std::vector<std::array<std::string,3 > > arrays; std::vector<std::array<std::string,3 > > arrays;
std::array<std::string, 3> val; std::array<std::string, 3> val;
arrays.emplace_back(val); arrays.push_back(val);
val[0] = "one"; val[0] = "one";
arrays.emplace_back(val); arrays.push_back(val);
val[0] = ""; val[1] = "one"; val[2] = ""; val[0] = ""; val[1] = "one"; val[2] = "";
arrays.emplace_back(val); arrays.push_back(val);
val[0] = ""; val[1] = ""; val[2] = "one"; val[0] = ""; val[1] = ""; val[2] = "one";
arrays.emplace_back(val); arrays.push_back(val);
val[0] = "one"; val[1] = "one"; val[2] = "one"; 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"; val[0] = "one"; val[1] = "two"; val[2] = "three";
arrays.emplace_back(val); arrays.push_back(val);
array_tests(arrays); array_tests(arrays);
} }

View File

@@ -53,13 +53,13 @@ void int_tuple_test() {
void int_string_tuple_test() { void int_string_tuple_test() {
std::vector<std::tuple<int, std::string> > int_string_tuples; std::vector<std::tuple<int, std::string> > int_string_tuples;
int_string_tuples.push_back(std::make_tuple(0, "zero")); int_string_tuples.push_back(std::make_tuple(0, std::string("zero")));
int_string_tuples.push_back(std::make_tuple(1, "one")); int_string_tuples.push_back(std::make_tuple(1, std::string("one")));
int_string_tuples.push_back(std::make_tuple(2, "two")); int_string_tuples.push_back(std::make_tuple(2, std::string("two")));
int_string_tuples.push_back(std::make_tuple(0, "one")); int_string_tuples.push_back(std::make_tuple(0, std::string("one")));
int_string_tuples.push_back(std::make_tuple(1, "zero")); int_string_tuples.push_back(std::make_tuple(1, std::string("zero")));
int_string_tuples.push_back(std::make_tuple(0, "")); int_string_tuples.push_back(std::make_tuple(0, std::string("")));
int_string_tuples.push_back(std::make_tuple(1, "")); int_string_tuples.push_back(std::make_tuple(1, std::string("")));
tuple_tests(int_string_tuples); tuple_tests(int_string_tuples);
} }