arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [arrow] branch master updated: ARROW-1745: [Plasma] Include gtest after plasma/compat.h in tests.
Date Sat, 28 Oct 2017 11:52:49 GMT
This is an automated email from the ASF dual-hosted git repository.

uwe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new cc03a45  ARROW-1745: [Plasma] Include gtest after plasma/compat.h in tests.
cc03a45 is described below

commit cc03a457e3a2e7f56f5325fcac780762ecef0522
Author: Robert Nishihara <robertnishihara@gmail.com>
AuthorDate: Sat Oct 28 13:52:43 2017 +0200

    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 02b3832..0f19da5 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 7c9d901..b593b6a 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 {
 
 /**

-- 
To stop receiving notification emails like this one, please contact
['"commits@arrow.apache.org" <commits@arrow.apache.org>'].

Mime
View raw message