|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r78165 - trunk/libs/functional/hash/test
From: dnljms_at_[hidden]
Date: 2012-04-23 16:51:22
Author: danieljames
Date: 2012-04-23 16:51:21 EDT (Mon, 23 Apr 2012)
New Revision: 78165
URL: http://svn.boost.org/trac/boost/changeset/78165
Log:
Hash: fix tests for older C++0x libraries.
Text files modified:
trunk/libs/functional/hash/test/hash_std_array_test.cpp | 24 ++++++++++++------------
trunk/libs/functional/hash/test/hash_std_tuple_test.cpp | 14 +++++++-------
2 files changed, 19 insertions(+), 19 deletions(-)
Modified: trunk/libs/functional/hash/test/hash_std_array_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_std_array_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_std_array_test.cpp 2012-04-23 16:51:21 EDT (Mon, 23 Apr 2012)
@@ -50,11 +50,11 @@
std::vector<std::array<int, 1> > arrays;
std::array<int, 1> 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 @@
{
std::vector<std::array<std::string, 1> > arrays;
std::array<std::string, 1> 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 @@
{
std::vector<std::array<std::string,3 > > arrays;
std::array<std::string, 3> 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);
}
Modified: trunk/libs/functional/hash/test/hash_std_tuple_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_std_tuple_test.cpp (original)
+++ trunk/libs/functional/hash/test/hash_std_tuple_test.cpp 2012-04-23 16:51:21 EDT (Mon, 23 Apr 2012)
@@ -53,13 +53,13 @@
void int_string_tuple_test() {
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(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);
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk