coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-06-29 22:08:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source
This commit is contained in:
John Wellbelove 2018-10-28 15:37:46 +00:00
parent 4703b78fb9
commit fc09a70051
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/test_message_bus.cpp
View File

@ -205,9 +205,6 @@ namespace
int message_unknown_count;
};
etl::imessage_router* p_router;
etl::imessage_bus* p_bus;
SUITE(test_message_router)
{
//=========================================================================

16
test/test_no_stl_algorithm.cpp
View File

@ -103,11 +103,11 @@ namespace
}
};
std::ostream& operator << (std::ostream& os, const Data& data_)
{
os << data_.a << "," << data_.b;
return os;
}
// std::ostream& operator << (std::ostream& os, const Data& data_)
// {
// os << data_.a << "," << data_.b;
// return os;
// }
struct Greater : public std::binary_function<int, int, bool>
{
@ -383,7 +383,7 @@ namespace
int b = 2;
etlstd::swap(a, b);
CHECK_EQUAL(2, a);
CHECK_EQUAL(2, a);
CHECK_EQUAL(1, b);
}
@ -437,7 +437,7 @@ namespace
std::string::iterator itr1 = std::search(haystack.begin(), haystack.end(), needle.begin(), needle.begin());
std::string::iterator itr2 = etlstd::search(haystack.begin(), haystack.end(), needle.begin(), needle.begin());
CHECK(itr1 == itr2);
}
@ -493,7 +493,7 @@ namespace
etlstd::push_heap(data2.begin(), data2.end());
CHECK(std::is_heap(data2.begin(), data2.end()));
isEqual = std::equal(std::begin(data1), std::end(data1), std::begin(data2));
CHECK(isEqual);
}