From: Michael Andres <ma@suse.de>
Date: Wed, 2 May 2012 12:59:33 +0000 (+0200)
Subject: Workaround gcc bug #52841
X-Git-Tag: 11.5.0~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57475da665e910f03c322695403d2eeaf413f722;p=platform%2Fupstream%2Flibzypp.git

Workaround gcc bug #52841
---

diff --git a/zypp/Resolvable.h b/zypp/Resolvable.h
index e9a74b0..762f20e 100644
--- a/zypp/Resolvable.h
+++ b/zypp/Resolvable.h
@@ -36,7 +36,7 @@ namespace zypp
   /** Interface base for resolvable objects (identification and dependencies).
    * \todo Merge with ResObject
   */
-  class Resolvable : protected sat::Solvable,
+  class Resolvable : protected zypp::sat::Solvable,	// Note: gcc bug #52841 prohibits using just sat::Solvable
                      public base::ReferenceCounted, private base::NonCopyable
   {
     friend std::ostream & operator<<( std::ostream & str, const Resolvable & obj );
@@ -51,7 +51,7 @@ namespace zypp
   public:
 #ifndef SWIG // Swig treats it as syntax error
     /** Whether this represents a valid- or no-solvable. */
-    using sat::Solvable::operator bool_type;
+    using zypp::sat::Solvable::operator bool_type;	// Note: gcc bug #52841 prohibits using just sat::Solvable
 #endif
     /** Whether this represents an installed solvable. */
     bool isSystem() const
diff --git a/zypp/base/SafeBool.h b/zypp/base/SafeBool.h
index a203abd..a2aef6b 100644
--- a/zypp/base/SafeBool.h
+++ b/zypp/base/SafeBool.h
@@ -69,7 +69,7 @@ namespace zypp
     template<class _Derived>
       struct SafeBool : private safebool_detail::SafeBoolBase
       {
-        typedef safebool_detail::SafeBoolBase::bool_type bool_type;
+        using safebool_detail::SafeBoolBase::bool_type;
         operator bool_type() const
         {
           return( (static_cast<const _Derived *>(this))->boolTest()