Merge branch 'MSB8027'

* MSB8027:
  CMake: Avoid including parser.c twice
  Fix -Wunused-variable warning

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)

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