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

fix compiler warning

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5788 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-03-23 01:07:07 +00:00
commit 6791c60907
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/python/std_common.i
View file

@ -214,7 +214,7 @@ namespace swigpy {
typedef Type value_type; typedef Type value_type;
static value_type as(PyObject *obj, bool throw_error) { static value_type as(PyObject *obj, bool throw_error) {
value_type *v = 0; value_type *v = 0;
int res = obj ? asptr(obj, &v) : 0; int res = (obj ? asptr(obj, &v) : 0) && v;
if (res) { if (res) {
if (res == SWIG_NEWOBJ) { if (res == SWIG_NEWOBJ) {
value_type r(*v); value_type r(*v);
@ -224,6 +224,8 @@ namespace swigpy {
return *v; return *v;
} }
} else { } else {
// Uninitialized return value, no Type() constructor required.
static value_type *v_def = (Type*) malloc(sizeof(Type));
std::string msg = "a value of type '"; std::string msg = "a value of type '";
msg += swigpy::type_name<Type>(); msg += swigpy::type_name<Type>();
msg += "' is expected"; msg += "' is expected";
@ -231,6 +233,7 @@ namespace swigpy {
PyErr_SetString(PyExc_TypeError, msg.c_str()); PyErr_SetString(PyExc_TypeError, msg.c_str());
} }
if (throw_error) throw std::invalid_argument(msg); if (throw_error) throw std::invalid_argument(msg);
return *v_def;
} }
} }
}; };
@ -412,12 +415,12 @@ namespace swigpy {
#ifdef SWIG_STD_EXTEND_COMPARISON #ifdef SWIG_STD_EXTEND_COMPARISON
%define %std_extcomp(Class,T) %define %std_extcomp(Class,T)
%apply_if(SWIG_EqualType(T), %std_equal_methods(std::Class<T >)) %evalif(SWIG_EqualType(T), %std_equal_methods(std::Class<T >))
%apply_if(SWIG_OrderType(T), %std_order_methods(std::Class<T >)) %evalif(SWIG_OrderType(T), %std_order_methods(std::Class<T >))
%enddef %enddef
%define %_std_extcomp_2(Class,T,U) %define %_std_extcomp_2(Class,T,U)
%apply_if2(SWIG_EqualType(T),SWIG_EqualType(U),%std_equal_methods(std::Class<T,U >)) %evalif_2(SWIG_EqualType(T),SWIG_EqualType(U),%std_equal_methods(std::Class<T,U >))
%apply_if2(SWIG_OrderType(T),SWIG_EqualType(U),%std_order_methods(std::Class<T,U >)) %evalif_2(SWIG_OrderType(T),SWIG_EqualType(U),%std_order_methods(std::Class<T,U >))
%enddef %enddef
%define %std_extcomp_2(Class,T,...) %define %std_extcomp_2(Class,T,...)
%_std_extcomp_2(Class,T,__VA_ARGS__) %_std_extcomp_2(Class,T,__VA_ARGS__)