Skip to content

Commit

Permalink
ARROW-1745: [Plasma] Include gtest after plasma/compat.h in tests.
Browse files Browse the repository at this point in the history
Author: Robert Nishihara <[email protected]>

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

50d1675 [Robert Nishihara] Include gtest after plasma/compat.h in tests.
  • Loading branch information
robertnishihara authored and xhochy committed Oct 28, 2017
1 parent 2eb78b0 commit cc03a45
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cpp/src/plasma/test/client_tests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -29,6 +27,8 @@
#include "plasma/plasma.h"
#include "plasma/protocol.h"

#include "gtest/gtest.h"

namespace plasma {

std::string test_executable; // NOLINT
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/plasma/test/serialization_tests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
// specific language governing permissions and limitations
// under the License.

#include "gtest/gtest.h"

#include <sys/types.h>
#include <unistd.h>

Expand All @@ -25,6 +23,8 @@
#include "plasma/plasma.h"
#include "plasma/protocol.h"

#include "gtest/gtest.h"

namespace plasma {

/**
Expand Down

0 comments on commit cc03a45

Please sign in to comment.