Simplify aos::Init
Most of the variants were to deal with core, which has been gone for a
year. Simplify those all into InitGoogle.
InitGoogle should be renamed to Init at some point. It does everything
now.
Change-Id: I738ee03e9c5b2e6348ef33302835f915df68011f
diff --git a/y2017/actors/autonomous_actor_main.cc b/y2017/actors/autonomous_actor_main.cc
index 116e801..436902c 100644
--- a/y2017/actors/autonomous_actor_main.cc
+++ b/y2017/actors/autonomous_actor_main.cc
@@ -4,8 +4,8 @@
#include "aos/init.h"
#include "y2017/actors/autonomous_actor.h"
-int main(int /*argc*/, char * /*argv*/ []) {
- ::aos::Init(-1);
+int main(int argc, char *argv[]) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2017/control_loops/drivetrain/drivetrain_main.cc b/y2017/control_loops/drivetrain/drivetrain_main.cc
index 7f9a838..444838c 100644
--- a/y2017/control_loops/drivetrain/drivetrain_main.cc
+++ b/y2017/control_loops/drivetrain/drivetrain_main.cc
@@ -6,8 +6,8 @@
using ::frc971::control_loops::drivetrain::DrivetrainLoop;
-int main() {
- ::aos::InitNRT();
+int main(int argc, char **argv) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2017/control_loops/superstructure/superstructure_main.cc b/y2017/control_loops/superstructure/superstructure_main.cc
index 38b750f..1a8627c 100644
--- a/y2017/control_loops/superstructure/superstructure_main.cc
+++ b/y2017/control_loops/superstructure/superstructure_main.cc
@@ -3,8 +3,8 @@
#include "aos/events/shm_event_loop.h"
#include "aos/init.h"
-int main() {
- ::aos::InitNRT();
+int main(int argc, char **argv) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2017/joystick_reader.cc b/y2017/joystick_reader.cc
index a0c20d1..58a3918 100644
--- a/y2017/joystick_reader.cc
+++ b/y2017/joystick_reader.cc
@@ -320,8 +320,8 @@
} // namespace input
} // namespace y2017
-int main() {
- ::aos::InitNRT();
+int main(int argc, char **argv) {
+ ::aos::InitGoogle(&argc, &argv);
aos::FlatbufferDetachedBuffer<aos::Configuration> config =
aos::configuration::ReadConfig("config.json");
diff --git a/y2017/vision/target_receiver.cc b/y2017/vision/target_receiver.cc
index e96fba9..84d3428 100644
--- a/y2017/vision/target_receiver.cc
+++ b/y2017/vision/target_receiver.cc
@@ -72,7 +72,7 @@
} // namespace vision
} // namespace y2017
-int main(int /*argc*/, char ** /*argv*/) {
- ::aos::InitNRT();
+int main(int argc, char **argv) {
+ ::aos::InitGoogle(&argc, &argv);
::y2017::vision::Main();
}