Author: mlandres Date: Wed Aug 1 14:36:55 2007 New Revision: 6362 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6362&view=rev Log: Include forward declaration of resolvable smart pointer types in ResTraits.h. Modified: trunk/libzypp/zypp/Atom.cc trunk/libzypp/zypp/Message.cc trunk/libzypp/zypp/ResObject.cc trunk/libzypp/zypp/ResTraits.cc trunk/libzypp/zypp/ResTraits.h trunk/libzypp/zypp/Resolvable.cc trunk/libzypp/zypp/Script.cc trunk/libzypp/zypp/SystemResObject.cc Modified: trunk/libzypp/zypp/Atom.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Atom.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/Atom.cc (original) +++ trunk/libzypp/zypp/Atom.cc Wed Aug 1 14:36:55 2007 @@ -17,6 +17,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(Atom); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Atom::Atom Modified: trunk/libzypp/zypp/Message.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Message.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/Message.cc (original) +++ trunk/libzypp/zypp/Message.cc Wed Aug 1 14:36:55 2007 @@ -17,6 +17,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(Message); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Message::Message Modified: trunk/libzypp/zypp/ResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResObject.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/ResObject.cc (original) +++ trunk/libzypp/zypp/ResObject.cc Wed Aug 1 14:36:55 2007 @@ -19,6 +19,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(ResObject); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : ResObject::ResObject @@ -80,7 +82,7 @@ ByteCount ResObject::downloadSize() const { return pimpl().downloadSize(); } - + unsigned ResObject::mediaNr() const { return pimpl().mediaNr(); } @@ -92,7 +94,7 @@ Date ResObject::installtime() const { return pimpl().installtime(); } - + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ResTraits.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResTraits.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/ResTraits.cc (original) +++ trunk/libzypp/zypp/ResTraits.cc Wed Aug 1 14:36:55 2007 @@ -17,29 +17,28 @@ { ///////////////////////////////////////////////////////////////// template<> - const ResolvableTraits::KindType ResTraits<Package> ::kind( "Package" ); + const ResolvableTraits::KindType ResTraits<Package> ::kind( "Package" ); template<> - const ResolvableTraits::KindType ResTraits<Selection>::kind( "Selection" ); + const ResolvableTraits::KindType ResTraits<SrcPackage>::kind( "SrcPackage" ); template<> - const ResolvableTraits::KindType ResTraits<Pattern> ::kind( "Pattern" ); + const ResolvableTraits::KindType ResTraits<Selection> ::kind( "Selection" ); template<> - const ResolvableTraits::KindType ResTraits<Product> ::kind( "Product" ); + const ResolvableTraits::KindType ResTraits<Pattern> ::kind( "Pattern" ); template<> - const ResolvableTraits::KindType ResTraits<Patch> ::kind( "Patch" ); + const ResolvableTraits::KindType ResTraits<Product> ::kind( "Product" ); template<> - const ResolvableTraits::KindType ResTraits<Script> ::kind( "Script" ); + const ResolvableTraits::KindType ResTraits<Patch> ::kind( "Patch" ); template<> - const ResolvableTraits::KindType ResTraits<Message> ::kind( "Message" ); + const ResolvableTraits::KindType ResTraits<Script> ::kind( "Script" ); template<> - const ResolvableTraits::KindType ResTraits<Language> ::kind( "Language" ); + const ResolvableTraits::KindType ResTraits<Message> ::kind( "Message" ); template<> - const ResolvableTraits::KindType ResTraits<Atom> ::kind( "Atom" ); - + const ResolvableTraits::KindType ResTraits<Language> ::kind( "Language" ); template<> - const ResolvableTraits::KindType ResTraits<SystemResObject> ::kind( "System" ); + const ResolvableTraits::KindType ResTraits<Atom> ::kind( "Atom" ); template<> - const ResolvableTraits::KindType ResTraits<SrcPackage> ::kind( "SrcPackage" ); + const ResolvableTraits::KindType ResTraits<SystemResObject>::kind( "System" ); ///////////////////////////////////////////////////////////////// } // namespace zypp Modified: trunk/libzypp/zypp/ResTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResTraits.h?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/ResTraits.h (original) +++ trunk/libzypp/zypp/ResTraits.h Wed Aug 1 14:36:55 2007 @@ -19,21 +19,49 @@ namespace zypp { ///////////////////////////////////////////////////////////////// - class Resolvable; - class ResObject; + /** \defgroup ZYPP_RESOLVABLE_SMART_POINTER_TYPES + * Resolvable smart pointer types. + * + * Forward declaration of all Resolvable smart pointer + * types provided in \c ResTraits.h (recommended in header files): + * \code + * #include + * + * Resolvable_Ptr // Resolvable * + * ResTraits<Resolvable>::PtrType // same as above + * + * Resolvable_constPtr // const Resolvable * + * ResTraits<Resolvable>::constPtrType // same as above + * \endcode + * + * Synonym, but requires \c Resolvable.h being included: + * \code + * #include + * + * Resolvable::Ptr // same as Resolvable_Ptr but requires Resolvable.h + * Resolvable::constPtr // same as Resolvable_constPtr but requires Resolvable.h + * \endcode + * + * \note When adding a \c NewResolvable type here, dont forgett to + * put <tt>IMPL_PTR_TYPE(NewResolvable);</tt> into the \c NewResolvable.cc. + */ + //@{ + DEFINE_PTR_TYPE( Resolvable ); + DEFINE_PTR_TYPE( ResObject ); + + DEFINE_PTR_TYPE( Atom ); + DEFINE_PTR_TYPE( Package ); + DEFINE_PTR_TYPE( SrcPackage ); + DEFINE_PTR_TYPE( Selection ); + DEFINE_PTR_TYPE( Pattern ); + DEFINE_PTR_TYPE( Product ); + DEFINE_PTR_TYPE( Patch ); + DEFINE_PTR_TYPE( Script ); + DEFINE_PTR_TYPE( Message ); + DEFINE_PTR_TYPE( Language ); - class Atom; - class Package; - class SrcPackage; - class Selection; - class Pattern; - class Product; - class Patch; - class Script; - class Message; - class Language; - - class SystemResObject; + DEFINE_PTR_TYPE( SystemResObject ); + //@} /** Base of ResTraits. Defines the Resolvable::Kind type. */ struct ResolvableTraits Modified: trunk/libzypp/zypp/Resolvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolvable.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/Resolvable.cc (original) +++ trunk/libzypp/zypp/Resolvable.cc Wed Aug 1 14:36:55 2007 @@ -22,6 +22,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(Resolvable); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Resolvable::Resolvable Modified: trunk/libzypp/zypp/Script.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Script.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/Script.cc (original) +++ trunk/libzypp/zypp/Script.cc Wed Aug 1 14:36:55 2007 @@ -17,6 +17,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(Script); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Script::Script Modified: trunk/libzypp/zypp/SystemResObject.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/SystemResObject.cc?rev=6362&r1=6361&r2=6362&view=diff ============================================================================== --- trunk/libzypp/zypp/SystemResObject.cc (original) +++ trunk/libzypp/zypp/SystemResObject.cc Wed Aug 1 14:36:55 2007 @@ -21,6 +21,8 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + IMPL_PTR_TYPE(SystemResObject); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : SystemResObject::SystemResObject -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org