Merge branch 'stricter-warnings'

* stricter-warnings:
  Go changes for wrappers to compile as ISO C90
  Scilab typecheck typemaps fix for C90
  No error for one Javascript node warning
  Warning fix in testcase for Javascript node
  nested_extend_c testcase fix when compiled by C++ target languages
  Temporarily remove -Werror for Scilab testing
  C90 fixes for Javascript JSC
  There are a couple of testcases that aren't compliant and supression via pragmas doesn't work for gcc < 4.8
  Warning suppression change
  Scilab typemap fixes for C89
  compiler warning suppression correction in testcase
  Suppress pedantic warnings in C# testcases
  Suppress pedantic warnings in testcases
  Pedantic warning fix in testcase
  pedantic warning fix for D wrappers
  Travis testing to use testflags.py for setting CFLAGS and CXXFLAGS
  Add travis build for error-declaration-after-statement branch
This commit is contained in:
William S Fulton 2015-02-11 23:33:26 +00:00
commit 1ef899a57b
25 changed files with 163 additions and 119 deletions

View file

@ -198,7 +198,7 @@ enum UnmanagedExceptions {
UnmanagedSystemException,
UnmanagedArgumentException,
UnmanagedArgumentNullException,
UnmanagedArgumentOutOfRangeException,
UnmanagedArgumentOutOfRangeException
};
void check_exception(UnmanagedExceptions e) {

View file

@ -77,17 +77,17 @@ public:
Number quadruple(Number n) {
n.Value *= 4;
return n;
};
}
Number times8(const Number& num) {
Number n(num);
n.Value *= 8;
return n;
};
}
Number times12(const Number* num) {
Number n(*num);
n.Value *= 12;
return n;
};
}
%}
// Test $csinput expansion

View file

@ -8,6 +8,11 @@ enum ForwardEnum2 { CCC, DDD };
%}
%inline %{
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
/* ISO C forbids forward references to enum types [-Werror=pedantic] */
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
#if !defined(__SUNPRO_C)
enum ForwardEnum1;
enum ForwardEnum2;

View file

@ -1,6 +1,13 @@
%module enum_macro
%inline %{
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
/* comma at end of enumerator list [-Werror=pedantic] */
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
enum Greeks1
{
#define GREEK1 -1

View file

@ -29,7 +29,7 @@ enum AVPixelFormat * use_pixel_format_ptr(enum AVPixelFormat *px) {
return px;
}
const enum AVPixelFormat2 use_pixel_format2(const enum AVPixelFormat2 px) {
enum AVPixelFormat2 use_pixel_format2(const enum AVPixelFormat2 px) {
return px;
}
const enum AVPixelFormat2 * use_pixel_format_ptr2(const enum AVPixelFormat2 *px) {

View file

@ -1,7 +1,7 @@
%module li_std_auto_ptr
%{
#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // auto_ptr deprecation
#endif
%}

View file

@ -49,6 +49,12 @@
%warnfilter(SWIGWARN_PARSE_NAMED_NESTED_CLASS) Outer2::IgnoreMe;
%inline %{
#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
/* ISO C++ prohibits anonymous structs [-Werror=pedantic] */
#pragma GCC diagnostic ignored "-Wpedantic"
#endif
struct Outer {
typedef int Integer;
///////////////////////////////////////////

View file

@ -95,7 +95,7 @@ typedef struct {
} bar;
} FOO;
struct {
static struct {
int i;
} THING;
%}

View file

@ -41,7 +41,7 @@ namespace Teuchos {
namespace KokkosClassic {
namespace DefaultNode {
struct DefaultNodeType {};
};
}
}
namespace Tpetra {