From 61c4cb075b3660ff0331caf1784be4561be64612 Mon Sep 17 00:00:00 2001
From: Steve Peters <scpeters@openrobotics.org>
Date: Fri, 22 May 2020 16:18:17 -0700
Subject: [PATCH] patch gtest.cc to suppress gcc warnings

---
 test/gtest/gtest-1.10.0.diff               | 15 ++++++++++++
 test/gtest/gtest-20180605-98a0d007d70.diff | 28 ----------------------
 test/gtest/src/gtest.cc                    |  4 ++++
 3 files changed, 19 insertions(+), 28 deletions(-)
 create mode 100644 test/gtest/gtest-1.10.0.diff
 delete mode 100644 test/gtest/gtest-20180605-98a0d007d70.diff

diff --git a/test/gtest/gtest-1.10.0.diff b/test/gtest/gtest-1.10.0.diff
new file mode 100644
index 000000000..9df3ab210
--- /dev/null
+++ b/test/gtest/gtest-1.10.0.diff
@@ -0,0 +1,15 @@
+diff --git a/test/gtest/src/gtest.cc b/test/gtest/src/gtest.cc
+index a5b4e5a..1dff1a6 100644
+--- a/test/gtest/src/gtest.cc
++++ b/test/gtest/src/gtest.cc
+@@ -34,6 +34,10 @@
+ #include "gtest/internal/custom/gtest.h"
+ #include "gtest/gtest-spi.h"
+ 
++#ifndef _WIN32
++#pragma GCC system_header
++#endif
++
+ #include <ctype.h>
+ #include <math.h>
+ #include <stdarg.h>
diff --git a/test/gtest/gtest-20180605-98a0d007d70.diff b/test/gtest/gtest-20180605-98a0d007d70.diff
deleted file mode 100644
index 77c9cccab..000000000
--- a/test/gtest/gtest-20180605-98a0d007d70.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -r 142c19af194c test/gtest/include/gtest/internal/gtest-port.h
---- a/test/gtest/include/gtest/internal/gtest-port.h	Thu Jun 07 13:05:44 2018 -0700
-+++ b/test/gtest/include/gtest/internal/gtest-port.h	Thu Jun 07 14:17:57 2018 -0700
-@@ -43,6 +43,10 @@
- #ifndef GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
- #define GTEST_INCLUDE_GTEST_INTERNAL_GTEST_PORT_H_
- 
-+#ifndef _WIN32
-+#pragma GCC system_header
-+#endif
-+
- // Environment-describing macros
- // -----------------------------
- //
-diff -r 142c19af194c test/gtest/src/gtest.cc
---- a/test/gtest/src/gtest.cc	Thu Jun 07 13:05:44 2018 -0700
-+++ b/test/gtest/src/gtest.cc	Thu Jun 07 14:17:57 2018 -0700
-@@ -35,6 +35,10 @@
- #include "gtest/internal/custom/gtest.h"
- #include "gtest/gtest-spi.h"
- 
-+#ifndef _WIN32
-+#pragma GCC system_header
-+#endif
-+
- #include <ctype.h>
- #include <math.h>
- #include <stdarg.h>
diff --git a/test/gtest/src/gtest.cc b/test/gtest/src/gtest.cc
index a5b4e5ac7..1dff1a6af 100644
--- a/test/gtest/src/gtest.cc
+++ b/test/gtest/src/gtest.cc
@@ -34,6 +34,10 @@
 #include "gtest/internal/custom/gtest.h"
 #include "gtest/gtest-spi.h"
 
+#ifndef _WIN32
+#pragma GCC system_header
+#endif
+
 #include <ctype.h>
 #include <math.h>
 #include <stdarg.h>