mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-26 15:48:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(c-wrapper): return correctly cObject in getCBackPtr

Browse source
This commit is contained in:
Ronan Abhamon 2017-09-22 17:13:33 +02:00
parent bd11c0980f
commit d1dc5af4ea
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/c-wrapper/internal/c-tools.h
View file

@ -153,22 +153,22 @@ public:
// Macro helpers.
template<typename T>
static T *getCppPtr (const std::shared_ptr<T> &cppObject) {
static inline T *getCppPtr (const std::shared_ptr<T> &cppObject) {
return cppObject.get();
}
template<typename T>
static T *getCppPtr (T *cppObject) {
static inline T *getCppPtr (T *cppObject) {
return cppObject;
}
template<typename T>
static const T *getCppPtr (const std::shared_ptr<const T> &cppObject) {
static inline const T *getCppPtr (const std::shared_ptr<const T> &cppObject) {
return cppObject.get();
}
template<typename T>
static const T *getCppPtr (const T *cppObject) {
static inline const T *getCppPtr (const T *cppObject) {
return cppObject;
}
@ -183,14 +183,14 @@ public:
static inline typename CppTypeToCType<CppType>::type *getCBackPtr (const std::shared_ptr<CppType> &cppObject) {
typedef typename CppTypeToCType<CppType>::type RetType;
Variant v = cppObject->getProperty("LinphonePrivate::Wrapper::cBackPtr");
void *value = v.getValue<void *>();
if (!value) {
RetType *cObject = CObjectInitializer<CppType>::init();
setCppPtrFromC(cObject, cppObject);
}
Variant variant = cppObject->getProperty("LinphonePrivate::Wrapper::cBackPtr");
void *value = variant.getValue<void *>();
if (value)
return reinterpret_cast<RetType *>(value);
return reinterpret_cast<RetType *>(value);
RetType *cObject = CObjectInitializer<CppType>::init();
setCppPtrFromC(cObject, cppObject);
return cObject;
}
template<
@ -202,12 +202,12 @@ public:
Variant v = cppObject->getProperty("LinphonePrivate::Wrapper::cBackPtr");
void *value = v.getValue<void *>();
if (!value) {
RetType *cObject = CObjectInitializer<CppType>::init();
setCppPtrFromC(cObject, cppObject);
}
if (value)
return reinterpret_cast<RetType *>(value);
return reinterpret_cast<RetType *>(value);
RetType *cObject = CObjectInitializer<CppType>::init();
setCppPtrFromC(cObject, cppObject);
return cObject;
}
// ---------------------------------------------------------------------------