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

[PHP] Update warnings about clashes between identifiers and PHP

Browse source 
keywords and automatic renaming to work with the PHP5 class 
wrappers.  Fixes SF#1613679.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11460 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2009-07-28 13:12:06 +00:00
commit c321421bc5
8 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/name_warnings.i
View file

@ -35,7 +35,9 @@ namespace std
{
typedef complex None;
#ifndef SWIGPHP // clone() *is* an invalid method name in PHP.
A* clone(int) { return NULL; }
#endif
virtual ~A() {}
virtual int func() = 0;

3
Examples/test-suite/operator_overload_break.i
View file

@ -12,7 +12,6 @@
%rename(PlusPlusPostfix) operator++(int);
#endif
%{
#include <iostream>
using namespace std;
@ -56,7 +55,7 @@ public:
Op& operator++() {k++; return *this;}
void Print() {std::cerr << k << std::endl;}
void PrintK() {std::cerr << k << std::endl;}
int k;
};

4
Examples/test-suite/php/Makefile.in
View file

@ -8,8 +8,8 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = @top_builddir@
#CPP_TEST_CASES += \
# php_namewarn_rename \
CPP_TEST_CASES += \
php_namewarn_rename \
include $(srcdir)/../common.mk

7
Examples/test-suite/template_default.i
View file

@ -1,8 +1,7 @@
%module template_default
%warnfilter(SWIGWARN_RUBY_WRONG_NAME) ns1::Traits::c; /* Ruby, wrong constant name */
namespace ns1 {
namespace ns2 {
@ -154,8 +153,8 @@ namespace ns1 {
%}
%template(Do) ns1::ns4::D<ns1::Traits>;
%template(Bo) ns1::ns4::Base<ns1::Traits, ns1::ns4::D<ns1::Traits> >;
%template(Doo) ns1::ns4::D<ns1::Traits>;
%template(Boo) ns1::ns4::Base<ns1::Traits, ns1::ns4::D<ns1::Traits> >;

8
Examples/test-suite/template_default2.i
View file

@ -8,7 +8,7 @@
enum Polarization { UnaryPolarization, BinaryPolarization };
template <Polarization P>
struct Interface
struct Interface_tpl
{
};
@ -19,7 +19,7 @@
template <class C,
Polarization P = C::pmode,
class Base = Interface<P> > // **** problem here *****
class Base = Interface_tpl<P> > // **** problem here *****
struct Module : Base
{
};
@ -29,12 +29,12 @@
namespace oss
{
%template(Interface_UP) Interface<UnaryPolarization>;
%template(Interface_UP) Interface_tpl<UnaryPolarization>;
// This works
%template(Module_UP1) Module<traits,
UnaryPolarization,
Interface<UnaryPolarization> >;
Interface_tpl<UnaryPolarization> >;
// These don't
%template(Module_UP2) Module<traits, UnaryPolarization>;