diff options
| -rw-r--r-- | VERSION.cmake | 2 | ||||
| -rw-r--r-- | package/libzypp-bindings.changes | 7 | ||||
| -rw-r--r-- | swig/KeyRing.i | 4 | ||||
| -rw-r--r-- | swig/ResTraits.i | 16 | ||||
| -rw-r--r-- | swig/Resolver.i | 4 | ||||
| -rw-r--r-- | swig/Target.i | 4 | ||||
| -rw-r--r-- | swig/ZYppFactory.i | 4 |
7 files changed, 24 insertions, 17 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 9370097..69057d5 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "5") -SET(VERSION_PATCH "13") +SET(VERSION_PATCH "14") diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 31e6621..2193625 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 28 14:02:12 CET 2013 - mls@suse.de + +- work around swig problem creating two different types for + intrusive_ptr +- version 0.5.14 + +------------------------------------------------------------------- Tue Jun 5 09:27:07 UTC 2012 - jreidinger@suse.com - disable segfaulting python test diff --git a/swig/KeyRing.i b/swig/KeyRing.i index dd938fc..cf80a17 100644 --- a/swig/KeyRing.i +++ b/swig/KeyRing.i @@ -20,8 +20,8 @@ } namespace zypp { - typedef intrusive_ptr<KeyRing> KeyRing_Ptr; - %template(KeyRing_Ptr) intrusive_ptr<KeyRing>; + typedef ::zypp::intrusive_ptr<KeyRing> KeyRing_Ptr; + %template(KeyRing_Ptr) ::zypp::intrusive_ptr<KeyRing>; } %template(List_PublicKey) std::list<zypp::PublicKey>; diff --git a/swig/ResTraits.i b/swig/ResTraits.i index 664113d..6658bdb 100644 --- a/swig/ResTraits.i +++ b/swig/ResTraits.i @@ -15,10 +15,10 @@ namespace zypp typedef zypp::intrusive_ptr<const _Res> constPtrType; }; - typedef intrusive_ptr<const ResObject> ResObject_constPtr; - typedef intrusive_ptr<ResObject> ResObject_Ptr; - %template(ResObject_constPtr) intrusive_ptr<const zypp::ResObject>; - %template(ResObject_Ptr) intrusive_ptr<zypp::ResObject>; + typedef ::zypp::intrusive_ptr<const ResObject> ResObject_constPtr; + typedef ::zypp::intrusive_ptr<ResObject> ResObject_Ptr; + %template(ResObject_constPtr) ::zypp::intrusive_ptr<const zypp::ResObject>; + %template(ResObject_Ptr) ::zypp::intrusive_ptr<zypp::ResObject>; } @@ -34,10 +34,10 @@ namespace zypp %define %STUFF(X) namespace zypp { - typedef intrusive_ptr<const X> X##_constPtr; - typedef intrusive_ptr<X> X##_Ptr; - %template(X##_constPtr) intrusive_ptr<const X>; - %template(X##_Ptr) intrusive_ptr<X>; + typedef ::zypp::intrusive_ptr<const X> X##_constPtr; + typedef ::zypp::intrusive_ptr<X> X##_Ptr; + %template(X##_constPtr) ::zypp::intrusive_ptr<const X>; + %template(X##_Ptr) ::zypp::intrusive_ptr<X>; bool isKind##X( const zypp::Resolvable::constPtr & p ); bool isKind##X( const zypp::PoolItem & p ); diff --git a/swig/Resolver.i b/swig/Resolver.i index 2d1f402..d4245c7 100644 --- a/swig/Resolver.i +++ b/swig/Resolver.i @@ -9,8 +9,8 @@ namespace zypp { - typedef intrusive_ptr< Resolver > Resolver_Ptr; - %template(Resolver_Ptr) intrusive_ptr<Resolver>; + typedef ::zypp::intrusive_ptr< Resolver > Resolver_Ptr; + %template(Resolver_Ptr) ::zypp::intrusive_ptr<Resolver>; #ifndef SWIGRUBY /* swig generates wrong code (>> instead of > > for template type) diff --git a/swig/Target.i b/swig/Target.i index b8c2e3c..111740f 100644 --- a/swig/Target.i +++ b/swig/Target.i @@ -7,8 +7,8 @@ namespace zypp %include <zypp/Target.h> namespace zypp { -typedef intrusive_ptr<Target> Target_Ptr; -%template(Target_Ptr) intrusive_ptr<Target>; +typedef ::zypp::intrusive_ptr<Target> Target_Ptr; +%template(Target_Ptr) ::zypp::intrusive_ptr<Target>; } %{ namespace zypp diff --git a/swig/ZYppFactory.i b/swig/ZYppFactory.i index 1c1d676..3ac0b5a 100644 --- a/swig/ZYppFactory.i +++ b/swig/ZYppFactory.i @@ -3,7 +3,7 @@ namespace zypp { -typedef intrusive_ptr<ZYpp> ZYpp_Ptr; -%template(ZYpp_Ptr) intrusive_ptr<ZYpp>; +typedef ::zypp::intrusive_ptr<ZYpp> ZYpp_Ptr; +%template(ZYpp_Ptr) ::zypp::intrusive_ptr<ZYpp>; } |