jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test-suite fixes (Java directors) for compilers that don't support varargs

Browse source
This commit is contained in:
William S Fulton 2018-05-05 15:35:46 +01:00
commit 8555973a48
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Examples/test-suite/java_director_exception_feature.i
View file

@ -168,9 +168,9 @@ namespace MyNS {
%{ %{
// throw is deprecated in C++11 and invalid in C++17 and later // throw is deprecated in C++11 and invalid in C++17 and later
#if defined(__cplusplus) && __cplusplus >= 201103L #if defined(__cplusplus) && __cplusplus >= 201103L
#define throw(TYPES...) #define throw(TYPE1, TYPE2)
#else #else
#define throw(TYPES...) throw(TYPES) #define throw(TYPE1, TYPE2) throw(TYPE1, TYPE2)
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#endif #endif
@ -189,7 +189,7 @@ public:
virtual std::string ping(int excp) throw(int,MyNS::Exception2) = 0; virtual std::string ping(int excp) throw(int,MyNS::Exception2) = 0;
virtual std::string pong(int excp) /* throws MyNS::Exception1 MyNS::Exception2 MyNS::Unexpected) */ = 0; virtual std::string pong(int excp) /* throws MyNS::Exception1 MyNS::Exception2 MyNS::Unexpected) */ = 0;
virtual std::string genericpong(int excp) /* unspecified throws - exception is always DirectorException in C++, translated back to whatever thrown in java */ = 0; virtual std::string genericpong(int excp) /* unspecified throws - exception is always DirectorException in C++, translated back to whatever thrown in java */ = 0;
virtual std::string directorthrows_warning(int excp) throw(double) { return std::string(); } virtual std::string directorthrows_warning(int excp) throw(int,double) { return std::string(); }
}; };
// Make a bar from a foo, so a call to Java Bar // Make a bar from a foo, so a call to Java Bar

4
Examples/test-suite/java_director_exception_feature_nspace.i
View file

@ -175,9 +175,9 @@ namespace MyNS {
%{ %{
// throw is deprecated in C++11 and invalid in C++17 and later // throw is deprecated in C++11 and invalid in C++17 and later
#if defined(__cplusplus) && __cplusplus >= 201103L #if defined(__cplusplus) && __cplusplus >= 201103L
#define throw(TYPES...) #define throw(TYPE1, TYPE2)
#else #else
#define throw(TYPES...) throw(TYPES) #define throw(TYPE1, TYPE2) throw(TYPE1, TYPE2)
#if defined(_MSC_VER) #if defined(_MSC_VER)
#pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow) #pragma warning(disable: 4290) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
#endif #endif