Merge pull request RobotLocomotion#5817 from jwnimmer-tri/cfi-cleanup…

…-pr3 Run clang-format-includes --all
KyleFromKitware · Apr 13, 2017 · 41d219c · 41d219c
2 parents a3c50f4 + f237158
commit 41d219c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/drake/automotive/automotive_demo.cc b/drake/automotive/automotive_demo.cc
@@ -12,7 +12,6 @@
 #include "drake/common/drake_path.h"
 #include "drake/common/text_logging_gflags.h"
 
-
 DEFINE_int32(num_simple_car, 0, "Number of SimpleCar vehicles. The cars are "
              "named \"0\", \"1\", \"2\", etc.");
 DEFINE_string(simple_car_names, "",

diff --git a/drake/common/call_matlab.cc b/drake/common/call_matlab.cc
@@ -1,14 +1,14 @@
 #include "drake/common/call_matlab.h"
 
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <cstring>
 #include <fstream>
 #include <limits>
 #include <string>
 
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include "google/protobuf/io/coded_stream.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 

diff --git a/drake/examples/QPInverseDynamicsForHumanoids/plan_eval/test/manipulator_plan_test.cc b/drake/examples/QPInverseDynamicsForHumanoids/plan_eval/test/manipulator_plan_test.cc
@@ -1,14 +1,12 @@
-#include "drake/examples/QPInverseDynamicsForHumanoids/plan_eval/manipulator_move_end_effector_plan.h"
-
 #include <gtest/gtest.h>
 
 #include "drake/common/drake_path.h"
 #include "drake/common/eigen_matrix_compare.h"
+#include "drake/examples/QPInverseDynamicsForHumanoids/plan_eval/manipulator_move_end_effector_plan.h"
 #include "drake/examples/QPInverseDynamicsForHumanoids/plan_eval/test/test_common.h"
+#include "drake/lcmt_manipulator_plan_move_end_effector.hpp"
 #include "drake/multibody/joints/floating_base_types.h"
 #include "drake/multibody/parsers/urdf_parser.h"
-
-#include "drake/lcmt_manipulator_plan_move_end_effector.hpp"
 #include "drake/util/lcmUtil.h"
 
 namespace drake {

diff --git a/drake/examples/ZMP/zmp_example.cc b/drake/examples/ZMP/zmp_example.cc
@@ -1,8 +1,8 @@
 #include <chrono>
 #include <thread>
 
-#include "drake/examples/ZMP/zmp_test_util.h"
 #include "drake/common/call_matlab.h"
+#include "drake/examples/ZMP/zmp_test_util.h"
 
 void PlotResults(const drake::examples::zmp::ZMPTestTraj& traj) {
   using drake::common::CallMatlab;

diff --git a/drake/multibody/multibody_tree/test/spatial_inertia_tests.cc b/drake/multibody/multibody_tree/test/spatial_inertia_tests.cc
@@ -1,11 +1,12 @@
-#include "gtest/gtest.h"
+#include "drake/multibody/multibody_tree/spatial_inertia.h"
 
 #include <limits>
 #include <sstream>
 
+#include "gtest/gtest.h"
+
 #include "drake/common/eigen_types.h"
 #include "drake/multibody/multibody_tree/rotational_inertia.h"
-#include "drake/multibody/multibody_tree/spatial_inertia.h"
 #include "drake/multibody/multibody_tree/unit_inertia.h"
 
 namespace drake {

diff --git a/drake/systems/lcm/test/lcm_driven_loop_test.cc b/drake/systems/lcm/test/lcm_driven_loop_test.cc
@@ -1,13 +1,13 @@
 #include "drake/systems/lcm/lcm_driven_loop.h"
+
 #include <gtest/gtest.h>
 #include <lcm/lcm-cpp.hpp>
 
 #include "drake/common/eigen_matrix_compare.h"
-#include "drake/systems/framework/diagram_builder.h"
-#include "drake/systems/primitives/signal_logger.h"
-
 #include "drake/lcm/drake_lcm.h"
 #include "drake/lcmt_drake_signal.hpp"
+#include "drake/systems/framework/diagram_builder.h"
+#include "drake/systems/primitives/signal_logger.h"
 
 namespace drake {
 namespace systems {

diff --git a/drake/systems/sensors/depth_sensor_to_lcm_point_cloud_message.h b/drake/systems/sensors/depth_sensor_to_lcm_point_cloud_message.h
@@ -5,7 +5,6 @@
 #include "drake/systems/framework/system_port_descriptor.h"
 #include "drake/systems/sensors/depth_sensor_specification.h"
 
-
 namespace drake {
 namespace systems {
 namespace sensors {

diff --git a/drake/systems/sensors/depth_sensor_to_lcm_point_cloud_message_demo.cc b/drake/systems/sensors/depth_sensor_to_lcm_point_cloud_message_demo.cc
@@ -1,7 +1,7 @@
 #include "drake/systems/sensors/depth_sensor_to_lcm_point_cloud_message.h"
 
-#include "bot_core/pointcloud_t.hpp"
 #include <gflags/gflags.h>
+#include "bot_core/pointcloud_t.hpp"
 
 #include "drake/common/text_logging_gflags.h"
 #include "drake/lcm/drake_lcm.h"

diff --git a/drake/systems/sensors/test/depth_sensor_to_lcm_point_cloud_message_test.cc b/drake/systems/sensors/test/depth_sensor_to_lcm_point_cloud_message_test.cc
@@ -4,8 +4,8 @@
 #include <memory>
 #include <utility>
 
-#include "bot_core/pointcloud_t.hpp"
 #include <gtest/gtest.h>
+#include "bot_core/pointcloud_t.hpp"
 
 #include "drake/common/drake_path.h"
 #include "drake/systems/framework/system_port_descriptor.h"