From 888581cb9781259073d190edede25e6253ec7dd9 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 21 Oct 2013 22:04:51 +0000 Subject: QPID-4984: WIP - Merge from trunk r.1534385. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534394 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/include/qpid/messaging/Handle.h | 9 +++++---- qpid/cpp/include/qpid/swig_perl_typemaps.i | 12 ++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'qpid/cpp/include') diff --git a/qpid/cpp/include/qpid/messaging/Handle.h b/qpid/cpp/include/qpid/messaging/Handle.h index 97a8f00b54..2edab26744 100644 --- a/qpid/cpp/include/qpid/messaging/Handle.h +++ b/qpid/cpp/include/qpid/messaging/Handle.h @@ -53,14 +53,15 @@ template class Handle { void swap(Handle& h) { T* t = h.impl; h.impl = impl; impl = t; } + private: + // Not implemented, subclasses must implement. + Handle(const Handle&); + Handle& operator=(const Handle&); + protected: typedef T Impl; QPID_MESSAGING_INLINE_EXTERN Handle() :impl() {} - // Not implemented,subclasses must implement. - QPID_MESSAGING_EXTERN Handle(const Handle&); - QPID_MESSAGING_EXTERN Handle& operator=(const Handle&); - Impl* impl; friend class PrivateImplRef; diff --git a/qpid/cpp/include/qpid/swig_perl_typemaps.i b/qpid/cpp/include/qpid/swig_perl_typemaps.i index da24bfe402..f1425ebd67 100644 --- a/qpid/cpp/include/qpid/swig_perl_typemaps.i +++ b/qpid/cpp/include/qpid/swig_perl_typemaps.i @@ -192,8 +192,10 @@ } %typemap (out) uint8_t, uint16_t, uint32_t, uint64_t { - sv_setuv($result, (UV)$1); - argvi++; + SV* tmp = sv_newmortal(); + sv_setuv(tmp, (UV)$1); + $result = tmp; + argvi++; } %typemap (in) int8_t, int16_t, int32_t, int64_t { @@ -206,8 +208,10 @@ } %typemap (out) int8_t, int16_t, int32_t, int64_t { - sv_setiv($result, (IV)$1); - argvi++; + SV* tmp = sv_newmortal(); + sv_setiv(tmp, (IV)$1); + $result = tmp; + argvi++; } %typemap(in) bool { -- cgit v1.2.1