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

Rename embedded smart pointer in SwigValueWrapper in order to avoid conflicts with the template type

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@11038 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2009-01-07 21:10:46 +00:00
commit c577ac1a31
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/swig.swg
View file

@ -634,7 +634,7 @@ namespace std {
* arg1 = Vector(1,2,3); // Assignment from a value * arg1 = Vector(1,2,3); // Assignment from a value
* *
* The class offers a strong guarantee of exception safety. * The class offers a strong guarantee of exception safety.
* With regards to the implementation, the private Pointer nested class is * With regards to the implementation, the private SwigMovePointer nested class is
* a simple smart pointer with move semantics, much like std::auto_ptr. * a simple smart pointer with move semantics, much like std::auto_ptr.
* *
* This wrapping technique was suggested by William Fulton and is henceforth * This wrapping technique was suggested by William Fulton and is henceforth
@ -646,17 +646,17 @@ namespace std {
#ifdef __cplusplus #ifdef __cplusplus
/* SwigValueWrapper is described in swig.swg */ /* SwigValueWrapper is described in swig.swg */
template<typename T> class SwigValueWrapper { template<typename T> class SwigValueWrapper {
struct Pointer { struct SwigMovePointer {
T *ptr; T *ptr;
Pointer(T *p) : ptr(p) { } SwigMovePointer(T *p) : ptr(p) { }
~Pointer() { delete ptr; } ~SwigMovePointer() { delete ptr; }
Pointer& operator=(Pointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
} pointer; } pointer;
SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs); SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
SwigValueWrapper(const SwigValueWrapper<T>& rhs); SwigValueWrapper(const SwigValueWrapper<T>& rhs);
public: public:
SwigValueWrapper() : pointer(0) { } SwigValueWrapper() : pointer(0) { }
SwigValueWrapper& operator=(const T& t) { Pointer tmp(new T(t)); pointer = tmp; return *this; } SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
operator T&() const { return *pointer.ptr; } operator T&() const { return *pointer.ptr; }
T *operator&() { return pointer.ptr; } T *operator&() { return pointer.ptr; }
};%} };%}