Skip to content
Snippets Groups Projects
Commit 5adc3975 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Update llevents_tut.cpp to use StringVec, not local StringList.

parent 025329b6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/test/llevents_tut.cpp
+ 4
− 5
View file @ 5adc3975
...@@ -316,7 +316,6 @@ void events_object::test<7>() ...@@ -316,7 +316,6 @@ void events_object::test<7>()
{ {
set_test_name("listener dependency order"); set_test_name("listener dependency order");
typedef LLEventPump::NameList NameList; typedef LLEventPump::NameList NameList;
typedef Collect::StringList StringList;
LLEventPump& button(pumps.obtain("button")); LLEventPump& button(pumps.obtain("button"));
Collect collector; Collect collector;
button.listen("Mary", button.listen("Mary",
...@@ -330,7 +329,7 @@ void events_object::test<7>() ...@@ -330,7 +329,7 @@ void events_object::test<7>()
button.listen("spot", button.listen("spot",
boost::bind(&Collect::add, boost::ref(collector), "spot", _1)); boost::bind(&Collect::add, boost::ref(collector), "spot", _1));
button.post(1); button.post(1);
ensure_equals(collector.result, make<StringList>(list_of("spot")("checked")("Mary"))); ensure_equals(collector.result, make<StringVec>(list_of("spot")("checked")("Mary")));
collector.clear(); collector.clear();
button.stopListening("Mary"); button.stopListening("Mary");
button.listen("Mary", button.listen("Mary",
...@@ -339,7 +338,7 @@ void events_object::test<7>() ...@@ -339,7 +338,7 @@ void events_object::test<7>()
// now "Mary" must come before "spot" // now "Mary" must come before "spot"
make<NameList>(list_of("spot"))); make<NameList>(list_of("spot")));
button.post(2); button.post(2);
ensure_equals(collector.result, make<StringList>(list_of("Mary")("spot")("checked"))); ensure_equals(collector.result, make<StringVec>(list_of("Mary")("spot")("checked")));
collector.clear(); collector.clear();
button.stopListening("spot"); button.stopListening("spot");
std::string threw; std::string threw;
...@@ -373,7 +372,7 @@ void events_object::test<7>() ...@@ -373,7 +372,7 @@ void events_object::test<7>()
boost::bind(&Collect::add, boost::ref(collector), "shoelaces", _1), boost::bind(&Collect::add, boost::ref(collector), "shoelaces", _1),
make<NameList>(list_of("checked"))); make<NameList>(list_of("checked")));
button.post(3); button.post(3);
ensure_equals(collector.result, make<StringList>(list_of("Mary")("checked")("yellow")("shoelaces"))); ensure_equals(collector.result, make<StringVec>(list_of("Mary")("checked")("yellow")("shoelaces")));
collector.clear(); collector.clear();
threw.clear(); threw.clear();
try try
...@@ -395,7 +394,7 @@ void events_object::test<7>() ...@@ -395,7 +394,7 @@ void events_object::test<7>()
ensure_contains("old order", threw, "was: Mary, checked, yellow, shoelaces"); ensure_contains("old order", threw, "was: Mary, checked, yellow, shoelaces");
ensure_contains("new order", threw, "now: Mary, checked, shoelaces, of, yellow"); ensure_contains("new order", threw, "now: Mary, checked, shoelaces, of, yellow");
button.post(4); button.post(4);
ensure_equals(collector.result, make<StringList>(list_of("Mary")("checked")("yellow")("shoelaces"))); ensure_equals(collector.result, make<StringVec>(list_of("Mary")("checked")("yellow")("shoelaces")));
} }
template<> template<> template<> template<>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment