Merge latest master into doxygen branch.

This commit is contained in:
Vadim Zeitlin 2014-12-15 02:54:57 +01:00
commit 9b857e6cf1
275 changed files with 6821 additions and 2094 deletions

View file

@ -29,7 +29,9 @@ comment */
%constant int ddd=;
#define E1 1234
#/*C comment*/define E2 1234
// This case doesn't actually work, but appeared to before we gave an error
// for unknown preprocessor directives.
// #/*C comment*/define E2 1234
#define E3 1234
%constant int eee=;

View file

@ -2,7 +2,7 @@ pp_constant.i:9: Warning 305: Bad constant value (ignored).
pp_constant.i:15: Warning 305: Bad constant value (ignored).
pp_constant.i:23: Warning 305: Bad constant value (ignored).
pp_constant.i:29: Warning 305: Bad constant value (ignored).
pp_constant.i:35: Warning 305: Bad constant value (ignored).
pp_constant.i:42: Warning 305: Bad constant value (ignored).
pp_constant.i:46: Warning 305: Bad constant value (ignored).
pp_constant.i:49: Warning 305: Bad constant value (ignored).
pp_constant.i:37: Warning 305: Bad constant value (ignored).
pp_constant.i:44: Warning 305: Bad constant value (ignored).
pp_constant.i:48: Warning 305: Bad constant value (ignored).
pp_constant.i:51: Warning 305: Bad constant value (ignored).