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

New templated method SwigValueInit to initialise all types - used initially for return types in director methods

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10063 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2007-10-28 23:07:33 +00:00
commit 421eb7ae60
3 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/swig.swg
View file

@ -632,7 +632,7 @@ namespace std {
#ifdef __cplusplus #ifdef __cplusplus
%insert("runtime") %{ %insert("runtime") %{
#ifdef __cplusplus #ifdef __cplusplus
template<class T> class SwigValueWrapper { template<typename T> class SwigValueWrapper {
T *tt; T *tt;
public: public:
SwigValueWrapper() : tt(0) { } SwigValueWrapper() : tt(0) { }
@ -644,7 +644,21 @@ public:
T *operator&() { return tt; } T *operator&() { return tt; }
private: private:
SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
}; };%}
/*
* SwigValueInit() is a generic initialisation solution as the following approach:
*
* T c_result = T();
*
* doesn't compile for all types for example:
*
* unsigned int c_result = unsigned int();
*/
%insert("runtime") %{
template <typename T> T SwigValueInit() {
return T();
}
#endif #endif
%} %}
#endif #endif

2
Source/Modules/csharp.cxx
View file

@ -3184,7 +3184,7 @@ public:
if (!is_void && !ignored_method) { if (!is_void && !ignored_method) {
if (!SwigType_isclass(returntype)) { if (!SwigType_isclass(returntype)) {
if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) {
String *construct_result = NewStringf("= %s()", SwigType_lstr(returntype, 0)); String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0));
Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL);
Delete(construct_result); Delete(construct_result);
} else { } else {

2
Source/Modules/java.cxx
View file

@ -3293,7 +3293,7 @@ public:
if (!is_void && (!ignored_method || pure_virtual)) { if (!is_void && (!ignored_method || pure_virtual)) {
if (!SwigType_isclass(returntype)) { if (!SwigType_isclass(returntype)) {
if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) { if (!(SwigType_ispointer(returntype) || SwigType_isreference(returntype))) {
String *construct_result = NewStringf("= %s()", SwigType_lstr(returntype, 0)); String *construct_result = NewStringf("= SwigValueInit< %s >()", SwigType_lstr(returntype, 0));
Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL); Wrapper_add_localv(w, "c_result", SwigType_lstr(returntype, "c_result"), construct_result, NIL);
Delete(construct_result); Delete(construct_result);
} else { } else {