From cc03a457e3a2e7f56f5325fcac780762ecef0522 Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Sat, 28 Oct 2017 13:52:43 +0200
Subject: [PATCH] ARROW-1745: [Plasma] Include gtest after plasma/compat.h in
 tests.

Author: Robert Nishihara <robertnishihara@gmail.com>

Closes #1261 from robertnishihara/fixosxproblem and squashes the following commits:

50d1675 [Robert Nishihara] Include gtest after plasma/compat.h in tests.
---
 cpp/src/plasma/test/client_tests.cc        | 4 ++--
 cpp/src/plasma/test/serialization_tests.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpp/src/plasma/test/client_tests.cc b/cpp/src/plasma/test/client_tests.cc
index 02b3832145186..0f19da5f72342 100644
--- a/cpp/src/plasma/test/client_tests.cc
+++ b/cpp/src/plasma/test/client_tests.cc
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "gtest/gtest.h"
-
 #include <assert.h>
 #include <signal.h>
 #include <stdlib.h>
@@ -29,6 +27,8 @@
 #include "plasma/plasma.h"
 #include "plasma/protocol.h"
 
+#include "gtest/gtest.h"
+
 namespace plasma {
 
 std::string test_executable;  // NOLINT
diff --git a/cpp/src/plasma/test/serialization_tests.cc b/cpp/src/plasma/test/serialization_tests.cc
index 7c9d90133a6d4..b593b6ae94890 100644
--- a/cpp/src/plasma/test/serialization_tests.cc
+++ b/cpp/src/plasma/test/serialization_tests.cc
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "gtest/gtest.h"
-
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -25,6 +23,8 @@
 #include "plasma/plasma.h"
 #include "plasma/protocol.h"
 
+#include "gtest/gtest.h"
+
 namespace plasma {
 
 /**