Remove dependency on Selectors and refactor codebase.
Change-Id: Ic3024b76ba0eea61f790c91c36090b4aa68702a3
Refs: #4522
diff --git a/examples/data-producer.cpp b/examples/data-producer.cpp
index 92dedd3..f81ab03 100644
--- a/examples/data-producer.cpp
+++ b/examples/data-producer.cpp
@@ -110,12 +110,10 @@
Publisher::run()
{
if (mode == AUTO) {
- m_scheduler.scheduleEvent(timeInterval,
- bind(&Publisher::autoGenerate, this));
+ m_scheduler.scheduleEvent(timeInterval, std::bind(&Publisher::autoGenerate, this));
}
else {
- m_scheduler.scheduleEvent(timeInterval,
- bind(&Publisher::generateFromFile, this));
+ m_scheduler.scheduleEvent(timeInterval, std::bind(&Publisher::generateFromFile, this));
}
m_face.processEvents(duration);
}
@@ -126,10 +124,8 @@
Name name = dataPrefix;
name.appendNumber(m_range());
std::shared_ptr<Data> data = createData(name);
- // std::cout<<"data name = "<<data->getName()<<std::endl;
m_face.put(*data);
- m_scheduler.scheduleEvent(timeInterval,
- bind(&Publisher::autoGenerate, this));
+ m_scheduler.scheduleEvent(timeInterval, std::bind(&Publisher::autoGenerate, this));
}
void
@@ -143,8 +139,7 @@
getline(insertStream, name);
std::shared_ptr<Data> data = createData(Name(name));
m_face.put(*data);
- m_scheduler.scheduleEvent(timeInterval,
- bind(&Publisher::generateFromFile, this));
+ m_scheduler.scheduleEvent(timeInterval, std::bind(&Publisher::generateFromFile, this));
}
std::shared_ptr<Data>
@@ -206,7 +201,7 @@
generator.duration = milliseconds(boost::lexical_cast<uint64_t>(optarg));
}
catch (const boost::bad_lexical_cast&) {
- std::cerr << "-s option should be an integer.";
+ std::cerr << "-s option should be an integer" << std::endl;;
return 1;
}
break;
@@ -215,7 +210,7 @@
generator.timeInterval = milliseconds(boost::lexical_cast<uint64_t>(optarg));
}
catch (const boost::bad_lexical_cast&) {
- std::cerr << "-t option should be an integer.";
+ std::cerr << "-t option should be an integer" << std::endl;;
return 1;
}
break;