Imported Upstream version 15.0.0

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

diff --git a/zypp/TriBool.h b/zypp/TriBool.h
index aa5e7ff..64488d1 100644 (file)
--- a/zypp/TriBool.h
+++ b/zypp/TriBool.h
@@ -13,7 +13,6 @@
 #define ZYPP_TRIBOOL_H
 
 #include <iosfwd>
-#include <string>
 #include <boost/logic/tribool.hpp>
 
 ///////////////////////////////////////////////////////////////////
@@ -41,20 +40,6 @@ namespace zypp
   using   boost::logic::tribool;
   using   boost::logic::indeterminate;
 
-  inline std::string asString( const TriBool & val_r, const std::string & istr_r = std::string(),
-                                                     const std::string & tstr_r = std::string(),
-                                                     const std::string & fstr_r = std::string() )
-  {
-    std::string ret;
-    if (indeterminate(val_r))
-      ret = ( istr_r.empty() ? "indeterminate" : istr_r );
-    else if (val_r)
-      ret = ( tstr_r.empty() ? "true" : tstr_r );
-    else
-      ret = ( fstr_r.empty() ? "false" : fstr_r );
-    return ret;
-  }
-
   /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////
@@ -64,11 +49,15 @@ namespace boost
     {
       /** \relates TriBool stream output */
       inline std::ostream & operator<<(std::ostream & s, const tribool & obj)
-      { return s << zypp::asString( obj ); }
-
-      /** \relates TriBool whether 2 tribool have the same state (this is NOT ==) */
-      inline bool sameTriboolState( tribool lhs, tribool rhs )
-      { return( ( indeterminate(lhs) && indeterminate(rhs) ) || ( lhs == rhs ) ); }
+      {
+        if (indeterminate(obj))
+          s << "indeterminate";
+        else if (obj)
+          s << "true";
+        else
+          s << "false";
+        return s;
+      }
     }
 }
 #endif // ZYPP_TRIBOOL_H