Imported Upstream version 16.3.2

[platform/upstream/libzypp.git] / zypp / IdStringType.h

diff --git a/zypp/IdStringType.h b/zypp/IdStringType.h
index f75cbbf..bb009be 100644 (file)
--- a/zypp/IdStringType.h
+++ b/zypp/IdStringType.h
@@ -83,10 +83,8 @@ namespace zypp
    * \ingroup g_CRTP
    */
   template <class Derived>
-  class IdStringType : protected sat::detail::PoolMember,
-                       private base::SafeBool<Derived>
+  class IdStringType : protected sat::detail::PoolMember
   {
-    typedef typename base::SafeBool<Derived>::bool_type bool_type;
     public:
       typedef IdString::IdType IdType;
 
@@ -100,7 +98,7 @@ namespace zypp
       const Derived & self() const { return *static_cast<const Derived*>( this ); }
 
     public:
-      const IdString & idStr()    const { return self()._str; }
+      IdString      idStr()       const { return self()._str; }
 
       bool          empty()       const { return idStr().empty(); }
       unsigned      size()        const { return idStr().size(); }
@@ -110,10 +108,18 @@ namespace zypp
       IdType        id()          const { return idStr().id(); }
 
     public:
-#ifndef SWIG // Swig treats it as syntax error
       /** Evaluate in a boolean context <tt>( ! empty() )</tt>. */
-      using base::SafeBool<Derived>::operator bool_type;
-#endif
+      explicit operator bool() const
+      { return ! empty(); }
+
+      /** Explicit conversion to IdString */
+      explicit operator IdString() const
+      { return idStr(); }
+
+      /** Explicit conversion to std::string */
+      explicit operator std::string() const
+      { return asString(); }
+
     public:
       // - break it down to idString/const char* <=> idString/cont char*
       // - handle idString(0)/NULL being the least value
@@ -152,12 +158,6 @@ namespace zypp
        if ( ! lhs ) return rhs ? -1 : 0;
        return rhs ? ::strcmp( lhs, rhs ) : 1;
       }
-
-    private:
-#ifndef SWIG // Swig treats it as syntax error
-      friend base::SafeBool<Derived>::operator bool_type() const;
-#endif
-      bool boolTest() const { return ! empty(); }
   };
   ///////////////////////////////////////////////////////////////////