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:
parent
7edd12aa3b
commit
f6bf2ec2fa
4 changed files with 16 additions and 11 deletions
|
|
@ -382,8 +382,8 @@ C_TEST_CASES += \
|
||||||
MULTI_CPP_TEST_CASES += \
|
MULTI_CPP_TEST_CASES += \
|
||||||
clientdata_prop \
|
clientdata_prop \
|
||||||
imports \
|
imports \
|
||||||
template_typedef_import \
|
mod \
|
||||||
mod
|
template_typedef_import
|
||||||
|
|
||||||
NOT_BROKEN_TEST_CASES = $(CPP_TEST_CASES:=.cpptest) \
|
NOT_BROKEN_TEST_CASES = $(CPP_TEST_CASES:=.cpptest) \
|
||||||
$(C_TEST_CASES:=.ctest) \
|
$(C_TEST_CASES:=.ctest) \
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,11 @@ see bottom for a set of possible tests
|
||||||
%}
|
%}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef SWIGPHP4
|
||||||
|
%rename(AndOperator) operator &&;
|
||||||
|
%rename(OrOperator) operator ||;
|
||||||
|
#endif
|
||||||
|
|
||||||
%inline %{
|
%inline %{
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,12 @@
|
||||||
|
|
||||||
// Ruby used to fail on the ordering of the two Class declarations below
|
// Ruby used to fail on the ordering of the two Class declarations below
|
||||||
|
|
||||||
struct Class {
|
struct Klass {
|
||||||
int variable;
|
int variable;
|
||||||
};
|
};
|
||||||
|
|
||||||
%{
|
%{
|
||||||
struct Class {
|
struct Klass {
|
||||||
int variable;
|
int variable;
|
||||||
};
|
};
|
||||||
%}
|
%}
|
||||||
|
|
|
||||||
|
|
@ -13,27 +13,27 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
struct Function
|
struct Funktion
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
// Egad!
|
// Egad!
|
||||||
template <class AF, class AG>
|
template <class AF, class AG>
|
||||||
struct Class
|
struct Klass
|
||||||
: Function<typename traits<AF, AG>::arg_type,
|
: Funktion<typename traits<AF, AG>::arg_type,
|
||||||
typename traits<AF, AG>::res_type>
|
typename traits<AF, AG>::res_type>
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
%}
|
%}
|
||||||
|
|
||||||
%{
|
%{
|
||||||
template struct Function <double, double>;
|
template struct Funktion <double, double>;
|
||||||
template struct Class <double, double>;
|
template struct Klass <double, double>;
|
||||||
%}
|
%}
|
||||||
|
|
||||||
%template(traits_dd) traits <double, double>;
|
%template(traits_dd) traits <double, double>;
|
||||||
%template(Function_dd) Function <double, double>;
|
%template(Funktion_dd) Funktion <double, double>;
|
||||||
%template(Class_dd) Class <double, double>;
|
%template(Klass_dd) Klass <double, double>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue