commit 872723ceaa8f2879ebdf1b41ed0ccd5f0bbdfe7a
author Austin Schuh <austin.linux@gmail.com> Wed Dec 25 14:38:09 2019 -0800
committer Austin Schuh <austin.linux@gmail.com> Sat Dec 28 13:10:22 2019 -0800
tree 1c7aba94dee4564dc2618be9be78c6073c57a5b7
parent a28cbc36df05d17b2c6504d26faf8e82ad231dfb

Switch to c++11 enums for flatbuffers

Change-Id: I99171464bf54efbb7eb322c556760dee86648f5e

aos/flatbuffer_introspection_test.cc

diff --git a/aos/flatbuffer_introspection_test.cc b/aos/flatbuffer_introspection_test.cc
index 54a2ab2..893b402 100644
--- a/aos/flatbuffer_introspection_test.cc
+++ b/aos/flatbuffer_introspection_test.cc
@@ -145,7 +145,7 @@
   flatbuffers::FlatBufferBuilder builder;
 
   ConfigurationBuilder config_builder(builder);
-  config_builder.add_foo_enum(BaseType_UShort);
+  config_builder.add_foo_enum(BaseType::UShort);
 
   builder.Finish(config_builder.Finish());
 
@@ -271,11 +271,12 @@
 TEST_F(FlatbufferIntrospectionTest, VectorEnumTest) {
   flatbuffers::FlatBufferBuilder builder;
 
-  auto enums = builder.CreateVector<int8_t>(
-      {BaseType_UShort, BaseType_Obj, BaseType_UInt});
+  auto enums = builder.CreateVector<BaseType>(
+      {BaseType::UShort, BaseType::Obj, BaseType::UInt});
 
   ConfigurationBuilder config_builder(builder);
-  config_builder.add_vector_foo_enum(enums);
+  config_builder.add_vector_foo_enum(
+      flatbuffers::Offset<flatbuffers::Vector<int8_t>>(enums.o));
 
   builder.Finish(config_builder.Finish());
 
@@ -287,7 +288,7 @@
 TEST_F(FlatbufferIntrospectionTest, StructEnumTest) {
   flatbuffers::FlatBufferBuilder builder;
 
-  StructEnum foo_struct(BaseType_UShort);
+  StructEnum foo_struct(BaseType::UShort);
 
   ConfigurationBuilder config_builder(builder);
   config_builder.add_foo_struct_enum(&foo_struct);

aos/input/drivetrain_input.cc

diff --git a/aos/input/drivetrain_input.cc b/aos/input/drivetrain_input.cc
index 687c8bb..8860c4d 100644
--- a/aos/input/drivetrain_input.cc
+++ b/aos/input/drivetrain_input.cc
@@ -108,9 +108,9 @@
   goal_builder.add_quickturn(data.IsPressed(quick_turn_));
   goal_builder.add_controller_type(
       is_line_following
-          ? drivetrain::ControllerType_LINE_FOLLOWER
-          : (is_control_loop_driving ? drivetrain::ControllerType_MOTION_PROFILE
-                                     : drivetrain::ControllerType_POLYDRIVE));
+          ? drivetrain::ControllerType::LINE_FOLLOWER
+          : (is_control_loop_driving ? drivetrain::ControllerType::MOTION_PROFILE
+                                     : drivetrain::ControllerType::POLYDRIVE));
   goal_builder.add_left_goal(current_left_goal);
   goal_builder.add_right_goal(current_right_goal);
   goal_builder.add_linear(linear_offset);