From a7a63483df799994312bf5eeea6751cb31e5bc1f Mon Sep 17 00:00:00 2001 From: Matias Fontanini Date: Sat, 25 Apr 2015 19:39:22 -0700 Subject: [PATCH] Fix gtest compilation issues on OSX. --- CMakeLists.txt | 2 ++ tests/src/ip.cpp | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f00fae..104a402 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ IF(MSVC) ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS=1") ELSE() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") + # Fix for Clang on OSX + ADD_DEFINITIONS("-DGTEST_HAS_TR1_TUPLE=0") ENDIF() # Build output checks diff --git a/tests/src/ip.cpp b/tests/src/ip.cpp index c3f6f00..189c4f1 100644 --- a/tests/src/ip.cpp +++ b/tests/src/ip.cpp @@ -659,13 +659,6 @@ TEST_F(IPTest, ConstructorFromBuffer) { EXPECT_EQ(sec.transmission_control, 0x68656cU); } -TEST_F(IPTest, Serialize) { - IP ip1(expected_packet, sizeof(expected_packet)); - PDU::serialization_type buffer = ip1.serialize(); - ASSERT_EQ(buffer.size(), sizeof(expected_packet)); - EXPECT_TRUE(std::equal(buffer.begin(), buffer.end(), expected_packet)); -} - TEST_F(IPTest, StackedProtocols) { IP ip = IP() / TCP(); IP::serialization_type buffer = ip.serialize();