enable APT in unpack/configure ordering to handle loops as well

[apt.git] / apt-pkg / contrib / error.cc

diff --git a/apt-pkg/contrib/error.cc b/apt-pkg/contrib/error.cc
index 18810d2a47f6234dbcbf2c90f3eb0678224fa567..122e2c8098eb6b063b87bdbcc0ef576b3bbc2c8c 100644 (file)
--- a/apt-pkg/contrib/error.cc
+++ b/apt-pkg/contrib/error.cc
@@ -13,6 +13,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/error.h>
 
 #include <iostream>
 #include <apt-pkg/error.h>
 
 #include <iostream>


@@ -24,8 +26,7 @@
 #include <string>
 #include <cstring>
 
 #include <string>
 #include <cstring>
 

-#include "config.h"
-                                                                       /*}}}*/
+                                                                       /*}}}*/

 
 // Global Error Object                                                 /*{{{*/
 /* If the implementation supports posix threads then the accessor function
 
 // Global Error Object                                                 /*{{{*/
 /* If the implementation supports posix threads then the accessor function


@@ -193,7 +194,7 @@ bool GlobalError::PopMessage(std::string &Text) {
 
        // check if another error message is pending
        for (std::list<Item>::const_iterator m = Messages.begin();
 
        // check if another error message is pending
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
+            m != Messages.end(); ++m)

                if (m->Type == ERROR || m->Type == FATAL)
                        return Ret;
 
                if (m->Type == ERROR || m->Type == FATAL)
                        return Ret;
 


@@ -210,7 +211,7 @@ void GlobalError::DumpErrors(std::ostream &out, MsgType const &threshold,
                        Messages.insert(Messages.begin(), s->Messages.begin(), s->Messages.end());
 
        for (std::list<Item>::const_iterator m = Messages.begin();
                        Messages.insert(Messages.begin(), s->Messages.begin(), s->Messages.end());
 
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
+            m != Messages.end(); ++m)

                if (m->Type >= threshold)
                        out << (*m) << std::endl;
        Discard();
                if (m->Type >= threshold)
                        out << (*m) << std::endl;
        Discard();


@@ -231,7 +232,7 @@ bool GlobalError::empty(MsgType const &trashhold) const {
                return true;
 
        for (std::list<Item>::const_iterator m = Messages.begin();
                return true;
 
        for (std::list<Item>::const_iterator m = Messages.begin();

-            m != Messages.end(); m++)
+            m != Messages.end(); ++m)

                if (m->Type >= trashhold)
                        return false;
 
                if (m->Type >= trashhold)
                        return false;