|
From: <ag...@us...> - 2011-01-12 12:02:27
|
Revision: 1876
http://zoolib.svn.sourceforge.net/zoolib/?rev=1876&view=rev
Author: agreen
Date: 2011-01-12 12:02:21 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
These mods make ObjC mix better with ZooLib entities.
Modified Paths:
--------------
trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_NS.h 2011-01-12 12:01:25 UTC (rev 1875)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_NS.h 2011-01-12 12:02:21 UTC (rev 1876)
@@ -60,10 +60,20 @@
~ZVal_NS();
ZVal_NS& operator=(const ZVal_NS& iOther);
- ZVal_NS(id iVal) : inherited(iVal) {}
- template <class S> ZVal_NS(const ZRef<S>& iVal) : inherited(iVal) {}
- template <class S> ZVal_NS(const Adopt_T<S>& iVal) : inherited(iVal) {}
+ ZVal_NS(id iVal)
+ : inherited(iVal)
+ {}
+ template <class S>
+ ZVal_NS(const ZRef<S>& iVal)
+ : inherited(iVal)
+ {}
+
+ template <class S>
+ ZVal_NS(const Adopt_T<S>& iVal)
+ : inherited(Adopt_T<NSObject*>(iVal.Get()))
+ {}
+
ZVal_NS(int8 iVal);
ZVal_NS(int16 iVal);
ZVal_NS(int32 iVal);
@@ -91,7 +101,7 @@
template <class S>
ZVal_NS& operator=(const Adopt_T<S>& iVal)
{
- inherited::operator=(iVal);
+ inherited::operator=(Adopt_T<NSObject*>(iVal.Get()));
return *this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|