Change class names in test code which clash with PHP reserved words
(Interface, Class, and Function - these are case insensitive reserved words in PHP). Fix lists of expected methods in rename_scope_runme.php to match those which we expect with PHP5. With this and the change above, this testcase now passes. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11545 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
54018f66a2
commit
d3809285a4
7 changed files with 34 additions and 34 deletions
|
|
@ -6,7 +6,7 @@
|
|||
enum Polarization { UnaryPolarization, BinaryPolarization };
|
||||
|
||||
template <Polarization P>
|
||||
struct Interface
|
||||
struct Interface_
|
||||
{
|
||||
};
|
||||
|
||||
|
|
@ -21,8 +21,8 @@
|
|||
|
||||
namespace oss
|
||||
{
|
||||
%template(Interface_UP) Interface<UnaryPolarization>;
|
||||
%template(Module_UPIUP) Module<UnaryPolarization,Interface<UnaryPolarization> >;
|
||||
%template(Interface_UP) Interface_<UnaryPolarization>;
|
||||
%template(Module_UPIUP) Module<UnaryPolarization,Interface_<UnaryPolarization> >;
|
||||
}
|
||||
|
||||
%inline %{
|
||||
|
|
@ -31,18 +31,18 @@ namespace oss
|
|||
namespace hello
|
||||
{
|
||||
struct HInterface1 :
|
||||
Interface<oss::UnaryPolarization> // this works (with fullns qualification)
|
||||
Interface_<oss::UnaryPolarization> // this works (with fullns qualification)
|
||||
{
|
||||
};
|
||||
|
||||
struct HInterface2 :
|
||||
Interface<UnaryPolarization> // this doesn't work
|
||||
Interface_<UnaryPolarization> // this doesn't work
|
||||
{
|
||||
};
|
||||
|
||||
struct HModule1 : Module<UnaryPolarization, Interface<UnaryPolarization> > {
|
||||
struct HModule1 : Module<UnaryPolarization, Interface_<UnaryPolarization> > {
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
%}
|
||||
%}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue