From 0d523d337d3dc64ea3c64e0c8b5025ae4cc16fab Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Fri, 21 Oct 2022 09:02:31 +0200 Subject: [PATCH 1/2] Fix -Wunused-variable warning --- Source/Modules/interface.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Modules/interface.cxx b/Source/Modules/interface.cxx index 5a9242399..83a5e5f8a 100644 --- a/Source/Modules/interface.cxx +++ b/Source/Modules/interface.cxx @@ -183,6 +183,7 @@ void Swig_interface_propagate_methods(Node *n) { if (Strcmp(symname, "$ignore") != 0) { Symtab *oldscope = Swig_symbol_setscope(Getattr(n, "symtab")); Node *on = Swig_symbol_add(symname, cn); + (void)on; assert(on == cn); // Features from the copied base class method are already present, now add in features specific to the added method in the derived class From 2f3fb6a52f59feb7b895c9ad22df781a50873dbf Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Fri, 21 Oct 2022 09:00:15 +0200 Subject: [PATCH 2/2] CMake: Avoid including parser.c twice Closes #2409 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a8862f63..7303f4cff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,6 +127,7 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/swigwarn.swg DESTINATION ${SWIG_LIB}) # --------- file (GLOB DOH_SOURCES ${SWIG_SOURCE_DIR}/DOH/*.c) file (GLOB CPARSE_SOURCES ${SWIG_SOURCE_DIR}/CParse/*.c) +list (REMOVE_ITEM CPARSE_SOURCES ${SWIG_SOURCE_DIR}/CParse/parser.c) list (APPEND CPARSE_SOURCES) file (GLOB PREPROCESSOR_SOURCES ${SWIG_SOURCE_DIR}/Preprocessor/*.c) file (GLOB CORE_SOURCES ${SWIG_SOURCE_DIR}/Swig/*.c)