Skip to content

Commit b6f66ca

Browse files
authored
Remove all code related to FAST CDR v1 (#169)
* Refs #21325: Regenerate types Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21325: Do not include fastcdr code in RTD builds Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #21325: Apply suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 284d2b0 commit b6f66ca

8 files changed

Lines changed: 69 additions & 367 deletions

File tree

fastdds_python/src/swig/fastdds.i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ namespace xtypes {
133133
// Failing to do so will issue a warning, but will not stop the compilation.
134134
// However, the resulting derived class will **not** be considered as inheriting from the base class
135135

136+
#ifndef FASTDDS_DOCS_BUILD
136137
%include <fastcdr/config.h>
137-
#if FASTCDR_VERSION_MAJOR > 1
138138
%include "fastcdr/xcdr/optional.i"
139139
#endif
140140

fastdds_python/test/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,11 @@
1515
# Compile types
1616
add_subdirectory(types)
1717

18-
set(fastcdr_version_argument "v2")
19-
if (${fastcdr_VERSION_MAJOR} EQUAL 1)
20-
set(fastcdr_version_argument "v1")
21-
endif()
22-
23-
2418
add_test(NAME api_tests
2519
COMMAND
2620
${Python3_EXECUTABLE}
2721
-m pytest
2822
-vrP
29-
--cdr ${fastcdr_version_argument}
3023
WORKING_DIRECTORY
3124
${CMAKE_CURRENT_SOURCE_DIR}/api
3225
)

fastdds_python/test/api/conftest.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

fastdds_python/test/api/test_datareader.py

Lines changed: 68 additions & 108 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)