diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2022-10-24 16:28:29 +0100 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2022-10-24 16:28:29 +0100 |
| commit | 38c2c15e61d8f4c59d0477bad4548045f7f5916f (patch) | |
| tree | f7fc1987bfdde1f6eb43399c3d294c871de3cdf3 | |
| parent | 6370fab025605ccf09e2d14e220a2cb02476427d (diff) | |
| parent | 2f3fb6a52f59feb7b895c9ad22df781a50873dbf (diff) | |
| download | swig-38c2c15e61d8f4c59d0477bad4548045f7f5916f.tar.gz | |
Merge branch 'MSB8027'
* MSB8027:
CMake: Avoid including parser.c twice
Fix -Wunused-variable warning
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Source/Modules/interface.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
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) 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 |