commit ac9610758cc607b9bcb9b18dc15e1c5a7600da1e
author Brian Silverman <brians> Sun May 17 01:42:33 2015 -0400
committer Brian Silverman <brians> Wed Aug 26 18:19:48 2015 -0700
tree 03056e0e48d929beace2562273553ae42e837c88
parent bfa0060e6aaaf16bb72a1e45652ce32bf2e2e081

Clean up drivetrain_action a bit

Change-Id: Iea39572276da2ecb4359a4b403796c95416109e7

y2014/actors/actors.gyp

diff --git a/y2014/actors/actors.gyp b/y2014/actors/actors.gyp
index 291e597..48a03d0 100644
--- a/y2014/actors/actors.gyp
+++ b/y2014/actors/actors.gyp
@@ -102,9 +102,8 @@
       ],
       'dependencies': [
         '<(AOS)/linux_code/linux_code.gyp:init',
-        '<(AOS)/common/actions/actions.gyp:action_lib',
-        'drivetrain_action_queue',
         'drivetrain_action_lib',
+        'drivetrain_action_queue',
       ],
     },
   ],

y2014/actors/drivetrain_actor.h

diff --git a/y2014/actors/drivetrain_actor.h b/y2014/actors/drivetrain_actor.h
index aa8f0b3..583121b 100644
--- a/y2014/actors/drivetrain_actor.h
+++ b/y2014/actors/drivetrain_actor.h
@@ -3,22 +3,23 @@
 
 #include <memory>
 
-#include "y2014/actors/drivetrain_action.q.h"
 #include "aos/common/actions/actor.h"
 #include "aos/common/actions/actions.h"
 
+#include "y2014/actors/drivetrain_action.q.h"
+
 namespace frc971 {
 namespace actors {
 
 class DrivetrainActor
-    : public aos::common::actions::ActorBase<DrivetrainActionQueueGroup> {
+    : public ::aos::common::actions::ActorBase<DrivetrainActionQueueGroup> {
  public:
   explicit DrivetrainActor(DrivetrainActionQueueGroup* s);
 
   bool RunAction(const actors::DrivetrainActionParams &params) override;
 };
 
-typedef aos::common::actions::TypedAction<DrivetrainActionQueueGroup>
+typedef ::aos::common::actions::TypedAction<DrivetrainActionQueueGroup>
     DrivetrainAction;
 
 // Makes a new DrivetrainActor action.