diff options
| author | Vadim Zeitlin <vz-swig@zeitlins.org> | 2016-12-05 02:14:51 +0100 |
|---|---|---|
| committer | Vadim Zeitlin <vz-swig@zeitlins.org> | 2016-12-12 01:24:17 +0100 |
| commit | e668c47b70d04ced2247405969ce0d180b419b56 (patch) | |
| tree | d120e9877685d6e130657e9fbd3886d22cd0d230 /Source/Include/swigwarn.h | |
| parent | 658f92a993a3c831f73cbc0a79dfc1ce7dd0dc7f (diff) | |
| parent | 3546d096a79857c6ebfe6f150bd7a0f1d6bbd232 (diff) | |
| download | swig-e668c47b70d04ced2247405969ce0d180b419b56.tar.gz | |
Merge branch 'master' into doxygen
The way Python docstrings are indented has changed on master, so use the
standard inspect module in Python autodoc unit test to ignore the differences
in their indentation level between -builtin and non-builtin cases to make the
test still pass with the branch version, which avoids the use of different
(but almost identical) values in the test itself.
Diffstat (limited to 'Source/Include/swigwarn.h')
| -rw-r--r-- | Source/Include/swigwarn.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Include/swigwarn.h b/Source/Include/swigwarn.h index a9acbb2cd..2d90001b2 100644 --- a/Source/Include/swigwarn.h +++ b/Source/Include/swigwarn.h @@ -93,8 +93,8 @@ #define WARN_PARSE_EXTEND_NAME 326 #define WARN_CPP11_LAMBDA 340 -#define WARN_CPP11_ALIAS_DECLARATION 341 -#define WARN_CPP11_ALIAS_TEMPLATE 342 +#define WARN_CPP11_ALIAS_DECLARATION 341 /* redundant now */ +#define WARN_CPP11_ALIAS_TEMPLATE 342 /* redundant now */ #define WARN_CPP11_VARIADIC_TEMPLATE 343 #define WARN_IGNORE_OPERATOR_NEW 350 /* new */ @@ -215,9 +215,9 @@ /* Feel free to claim any number in this space that's not currently being used. Just make sure you add an entry here */ -#define WARN_D_TYPEMAP_CTYPE_UNDEF 700 +#define WARN_D_TYPEMAP_CTYPE_UNDEF 700 #define WARN_D_TYPEMAP_IMTYPE_UNDEF 701 -#define WARN_D_TYPEMAP_DTYPE_UNDEF 702 +#define WARN_D_TYPEMAP_DTYPE_UNDEF 702 #define WARN_D_MULTIPLE_INHERITANCE 703 #define WARN_D_TYPEMAP_CLASSMOD_UNDEF 704 #define WARN_D_TYPEMAP_DBODY_UNDEF 705 @@ -264,6 +264,7 @@ #define WARN_JAVA_TYPEMAP_JAVAIN_UNDEF 818 #define WARN_JAVA_TYPEMAP_JAVADIRECTORIN_UNDEF 819 #define WARN_JAVA_TYPEMAP_JAVADIRECTOROUT_UNDEF 820 +#define WARN_JAVA_TYPEMAP_INTERFACECODE_UNDEF 821 #define WARN_JAVA_COVARIANT_RET 822 #define WARN_JAVA_TYPEMAP_JAVACONSTRUCT_UNDEF 823 #define WARN_JAVA_TYPEMAP_DIRECTORIN_NODESC 824 @@ -283,6 +284,7 @@ #define WARN_CSHARP_TYPEMAP_CSIN_UNDEF 838 #define WARN_CSHARP_TYPEMAP_CSDIRECTORIN_UNDEF 839 #define WARN_CSHARP_TYPEMAP_CSDIRECTOROUT_UNDEF 840 +#define WARN_CSHARP_TYPEMAP_INTERFACECODE_UNDEF 841 #define WARN_CSHARP_COVARIANT_RET 842 #define WARN_CSHARP_TYPEMAP_CSCONSTRUCT_UNDEF 843 #define WARN_CSHARP_EXCODE 844 |