fix php keyword warnings

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8528 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2006-01-23 21:46:49 +00:00
commit f6bf2ec2fa
4 changed files with 16 additions and 11 deletions

View file

@ -382,8 +382,8 @@ C_TEST_CASES += \
MULTI_CPP_TEST_CASES += \
clientdata_prop \
imports \
template_typedef_import \
mod
mod \
template_typedef_import
NOT_BROKEN_TEST_CASES = $(CPP_TEST_CASES:=.cpptest) \
$(C_TEST_CASES:=.ctest) \

View file

@ -66,6 +66,11 @@ see bottom for a set of possible tests
%}
#endif
#ifdef SWIGPHP4
%rename(AndOperator) operator &&;
%rename(OrOperator) operator ||;
#endif
%inline %{
#if defined(_MSC_VER)

View file

@ -2,12 +2,12 @@
// Ruby used to fail on the ordering of the two Class declarations below
struct Class {
struct Klass {
int variable;
};
%{
struct Class {
struct Klass {
int variable;
};
%}

View file

@ -13,27 +13,27 @@
};
template <class ArgType, class ResType>
struct Function
struct Funktion
{
};
// Egad!
template <class AF, class AG>
struct Class
: Function<typename traits<AF, AG>::arg_type,
struct Klass
: Funktion<typename traits<AF, AG>::arg_type,
typename traits<AF, AG>::res_type>
{
};
%}
%{
template struct Function <double, double>;
template struct Class <double, double>;
template struct Funktion <double, double>;
template struct Klass <double, double>;
%}
%template(traits_dd) traits <double, double>;
%template(Function_dd) Function <double, double>;
%template(Class_dd) Class <double, double>;
%template(Funktion_dd) Funktion <double, double>;
%template(Klass_dd) Klass <double, double>;