Merge remote-tracking branch 'mvo/feature/build-dep-dsc2' into debian/experimental

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

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 0d85b4fd3d115c9f57414116682aecc060a17f57..2100ee47b3c84dcc8efe313724b12a312239f7ee 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -21,6 +21,11 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 

+#include <stddef.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string>
+#include <vector>

 #include <ctype.h>
 #include <string.h>
 #include <sstream>
 #include <ctype.h>
 #include <string.h>
 #include <sstream>


@@ -33,9 +38,9 @@
 #include <iconv.h>
 
 #include <apti18n.h>
 #include <iconv.h>
 
 #include <apti18n.h>

-
-using namespace std;

                                                                        /*}}}*/
                                                                        /*}}}*/

+using namespace std;
+

 // Strip - Remove white space from the front and back of a string       /*{{{*/
 // ---------------------------------------------------------------------
 namespace APT {
 // Strip - Remove white space from the front and back of a string       /*{{{*/
 // ---------------------------------------------------------------------
 namespace APT {


@@ -1184,7 +1189,7 @@ unsigned long RegexChoice(RxChoiceList *Rxs,const char **ListBegin,
       R->Hit = false;
 
    unsigned long Hits = 0;
       R->Hit = false;
 
    unsigned long Hits = 0;

-   for (; ListBegin != ListEnd; ListBegin++)
+   for (; ListBegin < ListEnd; ++ListBegin)

    {
       // Check if the name is a regex
       const char *I;
    {
       // Check if the name is a regex
       const char *I;