Merge branch 'interfaces'
* interfaces: Documentation and CHANGES entry for interface feature interface macro argument name tweaks Change the name of the interface in %feature to be more portable Interface feature fix for typedef types Add limited support for %interface_impl and %shared_ptr Multiple inheritance warning wording tweak C# "override" fix for "extend" case Add checks for interface name symbol clashes interface feature test changes for the tests to pass for all languages Rename feature_interface.i to swiginterface.i Re-organization of the interface feature common code Port Java interface tests to C# Test %interface Test %interface_impl Use rstrip instead of regex encoder in %feature_rename Add rstrip encoder for use in %rename. Interface macros: %interface %interface_impl %interface_custom Add $interfacename family of special variable expansions Add multiple_inheritance_nspace testcase Interface name handling improvements and special variable changes Correct regex example comment Properly hide unexposed naming functions in naming.c C++ namespace testing for interface feature interface feature - SWIG_JAVABODY_PROXY does not need to be overridden Support namespaces and nspace with the interface feature for C# Support namespaces and nspace with the interface feature for Java Cosmetic test case changes Add Java premature garbage collection prevention parameter (pgcpp) to interface feature Create javainterfacecode and csinterfacecode typemaps IntPtr & HandleRef absolute names used virtual/override fix Improve interface feature checks Add another interface test selecting just one base as an interface Comments added to interface feature implementation and cosmetic code changes Add overloading tests for interface feature Refactor multiple inheritance warnings director generation fixes interface feature updates for C# latest on master interfaces branch merge fixes Remove unnecessary interfaces for concrete classes cosmetic code formatting changes Correct interface name attributes that are internal interface macro changes to support templates Test non-virtual method in Derived classes interface tests for a most derived class inheriting the interfaces further up the chain Rename GetCPtr/getCPtr to SWIGInterfaceUpcast interface feature support for const ref pointers (used by the STL) Interface feature support for arrays More interface feature testing for return values interface feature support for passing by value interface feature support for references Multiple inheritance parameters as pointers testing Simplify multiple_inheritance_abstract Java runtime test Warning fixes Rename test functions in multiple_inheritance_abstract testcase Formatting fixes in generated code for interface feature Cosmetic spacing changes in test case interface feature typemap corrections to handle NULL pointers interface test added javadirectorin fix interface implementation visibility interface inheritance (2) interface inheritance (1) feature:interface ported to Java propagate non-abstract "interface" base methods (3) propagate non-abstract "interface" base methods (2) propagate non-abstract "interface" base methods (1) namespace support added GetCPtr now returns HandleRef "feature:interface:name" is now mandatory attribute interfaces (1) interfaces (1) Conflicts: CHANGES.current
This commit is contained in:
commit
0f0345c214
39 changed files with 4624 additions and 255 deletions
|
|
@ -282,6 +282,10 @@ CPP_TEST_CASES += \
|
|||
minherit2 \
|
||||
mixed_types \
|
||||
multiple_inheritance \
|
||||
multiple_inheritance_abstract \
|
||||
multiple_inheritance_interfaces \
|
||||
multiple_inheritance_nspace \
|
||||
multiple_inheritance_shared_ptr \
|
||||
name_cxx \
|
||||
name_warnings \
|
||||
namespace_class \
|
||||
|
|
@ -341,6 +345,7 @@ CPP_TEST_CASES += \
|
|||
rename2 \
|
||||
rename3 \
|
||||
rename4 \
|
||||
rename_rstrip_encoder \
|
||||
rename_scope \
|
||||
rename_simple \
|
||||
rename_strip_encoder \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue