From eeeabc734ca29009b1565ef46f860061161cc51c Mon Sep 17 00:00:00 2001
From: Jacob Perron <jacob@openrobotics.org>
Date: Fri, 7 Jan 2022 15:24:39 -0800
Subject: [PATCH 1/2] Fix include order for cpplint

Relates to https://github.com/ament/ament_lint/pull/324

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
---
 test/test_accumulator.cpp | 6 +++---
 test/test_env.cpp         | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/test_accumulator.cpp b/test/test_accumulator.cpp
index da316763..1dc69b18 100644
--- a/test/test_accumulator.cpp
+++ b/test/test_accumulator.cpp
@@ -20,12 +20,12 @@
 #endif
 #endif
 
-#include <rcppmath/rolling_mean_accumulator.hpp>
-
-#include <gtest/gtest.h>
 #include <cmath>
 #include <memory>
 
+#include "gtest/gtest.h"
+
+#include <rcppmath/rolling_mean_accumulator.hpp>
 
 TEST(TestAccumulator, test_accumulator)
 {
diff --git a/test/test_env.cpp b/test/test_env.cpp
index 30a3e0eb..6fb849a4 100644
--- a/test/test_env.cpp
+++ b/test/test_env.cpp
@@ -12,13 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
-#include <rcpputils/env.hpp>
-
 #include <stdexcept>
 #include <string>
 
+#include "gtest/gtest.h"
+
+#include <rcpputils/env.hpp>
 
 /* Tests get_env_var.
  *

From e2bd3432d17342521d1e73a9ac61ac2947bb8a6a Mon Sep 17 00:00:00 2001
From: Jacob Perron <jacob@openrobotics.org>
Date: Mon, 10 Jan 2022 10:56:05 -0800
Subject: [PATCH 2/2] Use double-quotes for other includes

This is backwards compatible with older versions of cpplint.

Signed-off-by: Jacob Perron <jacob@openrobotics.org>
---
 test/test_accumulator.cpp | 2 +-
 test/test_env.cpp         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test_accumulator.cpp b/test/test_accumulator.cpp
index 1dc69b18..c4ec50bd 100644
--- a/test/test_accumulator.cpp
+++ b/test/test_accumulator.cpp
@@ -25,7 +25,7 @@
 
 #include "gtest/gtest.h"
 
-#include <rcppmath/rolling_mean_accumulator.hpp>
+#include "rcppmath/rolling_mean_accumulator.hpp"
 
 TEST(TestAccumulator, test_accumulator)
 {
diff --git a/test/test_env.cpp b/test/test_env.cpp
index 6fb849a4..81ca59c7 100644
--- a/test/test_env.cpp
+++ b/test/test_env.cpp
@@ -17,7 +17,7 @@
 
 #include "gtest/gtest.h"
 
-#include <rcpputils/env.hpp>
+#include "rcpputils/env.hpp"
 
 /* Tests get_env_var.
  *