Merge branch 'master' into C

Merge with the latest master before making more changes.
This commit is contained in:
Vadim Zeitlin 2021-10-04 16:03:36 +02:00
commit ac4f3c78be
1118 changed files with 15064 additions and 34376 deletions

View file

@ -157,9 +157,9 @@
#define WARN_TYPE_REDEFINED 404
#define WARN_TYPE_RVALUE_REF_QUALIFIER_IGNORED 405
#define WARN_TYPEMAP_SOURCETARGET 450
#define WARN_TYPEMAP_SOURCETARGET 450 /* No longer issued */
#define WARN_TYPEMAP_CHARLEAK 451
#define WARN_TYPEMAP_SWIGTYPE 452
#define WARN_TYPEMAP_SWIGTYPE 452 /* No longer issued */
#define WARN_TYPEMAP_APPLY_UNDEF 453
#define WARN_TYPEMAP_SWIGTYPELEAK 454
@ -282,6 +282,7 @@
#define WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC 824
#define WARN_JAVA_NO_DIRECTORCONNECT_ATTR 825
#define WARN_JAVA_NSPACE_WITHOUT_PACKAGE 826
#define WARN_JAVA_TYPEMAP_INTERFACEMODIFIERS_UNDEF 847
/* please leave 810-829 free for Java */
@ -302,22 +303,11 @@
#define WARN_CSHARP_EXCODE 844
#define WARN_CSHARP_CANTHROW 845
#define WARN_CSHARP_NO_DIRECTORCONNECT_ATTR 846
#define WARN_CSHARP_TYPEMAP_INTERFACEMODIFIERS_UNDEF 847
/* please leave 830-849 free for C# */
#define WARN_MODULA3_TYPEMAP_TYPE_UNDEF 850
#define WARN_MODULA3_TYPEMAP_GETCPTR_UNDEF 851
#define WARN_MODULA3_TYPEMAP_CLASSMOD_UNDEF 852
#define WARN_MODULA3_TYPEMAP_PTRCONSTMOD_UNDEF 853
#define WARN_MODULA3_TYPEMAP_MULTIPLE_RETURN 854
#define WARN_MODULA3_MULTIPLE_INHERITANCE 855
#define WARN_MODULA3_TYPECONSTRUCTOR_UNKNOWN 856
#define WARN_MODULA3_UNKNOWN_PRAGMA 857
#define WARN_MODULA3_BAD_ENUMERATION 858
#define WARN_MODULA3_DOUBLE_ID 859
#define WARN_MODULA3_BAD_IMPORT 860
/* please leave 850-869 free for Modula 3 */
/* 850-860 were used by Modula 3 (removed in SWIG 4.1.0) - avoid reusing for now */
#define WARN_PHP_MULTIPLE_INHERITANCE 870
#define WARN_PHP_UNKNOWN_PRAGMA 871