Skip to content

Commit 382768d

Browse files
author
Todd L. Montgomery
committed
[C++]: fixes for CentOS 7 build with gcc
1 parent 39b3076 commit 382768d

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ set(GTEST_SOURCE_DIR ${source_dir})
3333
ExternalProject_Get_Property(gtest binary_dir)
3434
set(GTEST_BINARY_DIR ${binary_dir})
3535

36+
find_package(Threads)
37+
3638
if(UNIX)
37-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -Ofast -DNDEBUG")
39+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -fexceptions -g -Wall -Ofast -DNDEBUG")
3840
endif()
3941

4042
if(APPLE)

test/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set(GTEST_LIBS
2121

2222
function(sbe_test name)
2323
add_executable("${name}" "${name}.cpp")
24-
target_link_libraries("${name}" sbe ${GTEST_LIBS})
24+
target_link_libraries("${name}" sbe ${GTEST_LIBS} ${CMAKE_THREAD_LIBS_INIT})
2525
add_test(NAME ${name} COMMAND ${name} WORKING_DIRECTORY ${CODEC_TARGET_DIR})
2626
if(${ARGC} GREATER 1)
2727
add_dependencies(${name} ${ARGV1})

test/cpp/OtfArrayTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ class OtfUInt32ArrayTest : public OtfMessageTest, public OtfMessageTestCBs
103103
uint32_t *array = (uint32_t *)dst;
104104
for (int i = 0; i < length; i++)
105105
{
106-
array[i] = seed ^ i;
106+
uint32_t value = seed ^ i;
107+
::memcpy(array, &value, sizeof(uint32_t));
108+
array++;
107109
}
108110
}
109111

test/cpp/OtfFullIrTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ class OtfFullIrTest : public testing::Test, public IrCollection, public Ir::Call
330330
EXPECT_EQ(f.primitiveType(3), Ir::CHAR);
331331
EXPECT_EQ(f.length(3), MANUFACTURER_CODE_LENGTH);
332332
f.getArray(3, tmp, 0, f.length(3));
333-
EXPECT_EQ(std::string(tmp, MANUFACTURER_CODE_LENGTH), MANUFACTURER_CODE);
333+
EXPECT_EQ(std::string(tmp, MANUFACTURER_CODE_LENGTH), std::string(MANUFACTURER_CODE, MANUFACTURER_CODE_LENGTH));
334334
EXPECT_EQ(f.primitiveType(4), Ir::CHAR);
335335
EXPECT_EQ(f.length(4), 6);
336336
f.getArray(4, tmp, 0, f.length(4));

0 commit comments

Comments
 (0)