Ran make format on merged files

personalrobotics · Aug 20, 2019 · ec642f4 · ec642f4
1 parent 973702c
commit ec642f4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/include/aikido/common/detail/memory-impl.hpp b/include/aikido/common/detail/memory-impl.hpp
@@ -7,7 +7,7 @@ namespace aikido {
 namespace common {
 
 //==============================================================================
-template<typename T, typename... Args>
+template <typename T, typename... Args>
 ::std::unique_ptr<T> make_unique(Args&&... args)
 {
 #if __cplusplus < 201300

diff --git a/include/aikido/io/detail/yaml_extension.hpp b/include/aikido/io/detail/yaml_extension.hpp
@@ -4,8 +4,8 @@
 #include <sstream>
 #include <unordered_map>
 #include <Eigen/Dense>
-#include "aikido/common/memory.hpp"
 #include <yaml-cpp/yaml.h>
+#include "aikido/common/memory.hpp"
 
 namespace aikido {
 namespace io {

diff --git a/include/aikido/rviz.hpp b/include/aikido/rviz.hpp
@@ -1,10 +1,10 @@
 #include "rviz/BodyNodeMarker.hpp"
 #include "rviz/FrameMarker.hpp"
 #include "rviz/InteractiveMarkerViewer.hpp"
-#include "rviz/pointers.hpp"
 #include "rviz/ResourceServer.hpp"
-#include "rviz/shape_conversions.hpp"
 #include "rviz/ShapeFrameMarker.hpp"
 #include "rviz/SkeletonMarker.hpp"
 #include "rviz/TSRMarker.hpp"
 #include "rviz/WorldInteractiveMarkerViewer.hpp"
+#include "rviz/pointers.hpp"
+#include "rviz/shape_conversions.hpp"
diff --git a/src/constraint/dart/TSR.cpp b/src/constraint/dart/TSR.cpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <boost/format.hpp>
 #include <dart/common/Console.hpp>
-#include "aikido/common/memory.hpp"
 #include <dart/math/Geometry.hpp>
+#include "aikido/common/memory.hpp"
 
 #undef dtwarn
 #define dtwarn (::dart::common::colorErr("Warning", __FILE__, __LINE__, 33))

diff --git a/src/planner/parabolic/ParabolicSmoother.cpp b/src/planner/parabolic/ParabolicSmoother.cpp
@@ -2,8 +2,8 @@
 
 #include <cassert>
 #include <set>
-#include "aikido/common/memory.hpp"
 #include "aikido/common/Spline.hpp"
+#include "aikido/common/memory.hpp"
 #include "aikido/planner/parabolic/ParabolicTimer.hpp"
 #include "DynamicPath.h"
 #include "HauserParabolicSmootherHelpers.hpp"

diff --git a/src/planner/parabolic/ParabolicTimer.cpp b/src/planner/parabolic/ParabolicTimer.cpp
@@ -2,8 +2,8 @@
 
 #include <cassert>
 #include <set>
-#include "aikido/common/memory.hpp"
 #include "aikido/common/Spline.hpp"
+#include "aikido/common/memory.hpp"
 #include "aikido/trajectory/Interpolated.hpp"
 #include "DynamicPath.h"
 #include "ParabolicUtil.hpp"

diff --git a/tests/common/test_StepSequence.cpp b/tests/common/test_StepSequence.cpp
@@ -1,5 +1,5 @@
-#include "aikido/common/memory.hpp"
 #include <gtest/gtest.h>
+#include "aikido/common/memory.hpp"
 #include <aikido/common/StepSequence.hpp>
 
 using aikido::common::StepSequence;

diff --git a/tests/constraint/test_TSR.cpp b/tests/constraint/test_TSR.cpp
@@ -1,8 +1,8 @@
 #include <Eigen/Dense>
 #include <Eigen/Geometry>
-#include "aikido/common/memory.hpp"
 #include <dart/math/Geometry.hpp>
 #include <gtest/gtest.h>
+#include "aikido/common/memory.hpp"
 #include <aikido/common/RNG.hpp>
 #include <aikido/constraint/Differentiable.hpp>
 #include <aikido/constraint/dart/TSR.hpp>