XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Testcase correction for using declaration and members 

The compiler calls setWindowGrab(bool) instead of setWindowsGrab(NativeWindowType*)
and gives a warning with Visual C++ when calling setWindowGrab(true)
with a pointer to ApplicationContextSDL.
Looks like function function hiding of the non-virtual method.
I can't see this changing testing of the original bug.
This commit is contained in:
William S Fulton 2022-03-14 19:09:46 +00:00
parent 1da824ceff
commit 7f97278739
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Examples/test-suite/director_using_member_scopes.i
View File

@ -26,7 +26,7 @@ namespace OgreBites
class ApplicationContextSDL : public ApplicationContextBase { class ApplicationContextSDL : public ApplicationContextBase {
public: public:
using ApplicationContextBase::setWindowGrab; using ApplicationContextBase::setWindowGrab;
int setWindowGrab(NativeWindowType* win, bool grab) { return 10; } // This should not be added again as it exists in base class int setWindowGrab(NativeWindowType* win, bool grab = true) { return 10; } // This should not be added again as it exists in base class
static int call_setWindowGrab(ApplicationContextSDL* ptr, NativeWindowType* win, bool grab) { return ptr->setWindowGrab(win, grab); } static int call_setWindowGrab(ApplicationContextSDL* ptr, NativeWindowType* win, bool grab) { return ptr->setWindowGrab(win, grab); }
}; };
@ -44,7 +44,7 @@ namespace OgreBites
class ACSDL : public ACB { class ACSDL : public ACB {
public: public:
using ACB::setWindowGrab; // This introduces two methods, not one method like ApplicationContextSDL using ACB::setWindowGrab; // This introduces two methods, not one method like ApplicationContextSDL
int setWindowGrab(NativeWindowType* win, bool grab) { return 10; } // This should not be added again as it exists in base class int setWindowGrab(NativeWindowType* win, bool grab = true) { return 10; } // This should not be added again as it exists in base class
static int call_setWindowGrab(ACSDL* ptr, NativeWindowType* win, bool grab) { return ptr->setWindowGrab(win, grab); } static int call_setWindowGrab(ACSDL* ptr, NativeWindowType* win, bool grab) { return ptr->setWindowGrab(win, grab); }
static int call_setWindowGrab(ACSDL* ptr, const char *s, int val) { return ptr->setWindowGrab(s, val); } static int call_setWindowGrab(ACSDL* ptr, const char *s, int val) { return ptr->setWindowGrab(s, val); }

2
Examples/test-suite/using_member_scopes.i
View File

@ -16,7 +16,7 @@ namespace OgreBites
class ApplicationContextSDL : public ApplicationContextBase { class ApplicationContextSDL : public ApplicationContextBase {
public: public:
using ApplicationContextBase::setWindowGrab; using ApplicationContextBase::setWindowGrab;
void setWindowGrab(NativeWindowType* win, bool grab) {} // This should not be added again as it exists in base class void setWindowGrab(NativeWindowType* win, bool grab = true) {} // This should not be added again as it exists in base class
}; };
/* /*
typedef not working yet typedef not working yet