Merge branch 'master' into no-lttng-python-packages

This commit is contained in:
Christophe Bedard 2019-08-16 11:53:42 +02:00
commit 33e56b9513
2 changed files with 12 additions and 2 deletions

View file

@ -69,7 +69,12 @@ private:
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
bool do_only_one = argc == 1; bool do_only_one = true;
for (int i = 0; i < argc; ++i) {
if (strncmp(argv[i], "do_more", 7) == 0) {
do_only_one = false;
}
}
rclcpp::init(argc, argv); rclcpp::init(argc, argv);

View file

@ -58,7 +58,12 @@ private:
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
bool do_only_one = argc == 1; bool do_only_one = true;
for (int i = 0; i < argc; ++i) {
if (strncmp(argv[i], "do_more", 7) == 0) {
do_only_one = false;
}
}
rclcpp::init(argc, argv); rclcpp::init(argc, argv);