Skip to content

Commit 9499808

Browse files
committed
fix: fix pipeline compile error
1 parent 4159bbc commit 9499808

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

examples/recorder_and_replayer/CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
cmake_minimum_required(VERSION 3.16)
1212
project(recorder_replayer LANGUAGES C CXX)
1313

14+
set(CMAKE_CXX_STANDARD 17)
15+
set(CMAKE_CXX_STANDARD_REQUIRED)
1416
include(FetchContent)
1517

1618
# Prevent subprojects (like mcap_builder) from attempting to find lz4/zstd
@@ -51,6 +53,17 @@ if(TARGET CycloneDDS::ddsc)
5153
endif()
5254
target_link_libraries(recorder CycloneDDS::ddsc dds_topic_descriptor_serde mcap)
5355

56+
57+
# add_executable(replayer dds_replayer.cpp)
58+
59+
# if(TARGET CycloneDDS::ddsc)
60+
# target_include_directories(replayer
61+
# PRIVATE
62+
# "${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/cdr/include"
63+
# "${CMAKE_CURRENT_SOURCE_DIR}/../../src/core/ddsi/include")
64+
# endif()
65+
# target_link_libraries(replayer CycloneDDS::ddsc dds_topic_descriptor_serde mcap)
66+
5467
# force to ignore many compile warnings in mcap...
5568
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
5669
set(disable_flags
@@ -63,6 +76,5 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Apple
6376
)
6477
target_compile_options(mcap PRIVATE ${disable_flags})
6578
target_compile_options(recorder PRIVATE ${disable_flags})
79+
# target_compile_options(replayer PRIVATE ${disable_flags})
6680
endif()
67-
68-
# add_executable(replayer dds_replayer.cpp)

examples/recorder_and_replayer/dds_topic_descriptor_serde.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ dds_topic_descriptor_t *dds_topic_descriptor_deserialize (const void *buffer, si
343343
goto error;
344344
memcpy (type_map_data, ptr, type_map_sz);
345345
*(const unsigned char **)&desc->type_mapping.data = type_map_data;
346-
ptr += type_map_sz;
347346
}
347+
assert (ptr == end);
348348

349349
return desc;
350350

0 commit comments

Comments
 (0)