test framework: Correctly generate new paths in noopchroot

[apt.git] / apt-pkg / contrib / hashsum_template.h

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index 97b6a4ad90cd1c7778f6f2aa1d51c3495796e656..d0ea0971ea5e2502e92ef18845789604765836fa 100644 (file)
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -10,20 +10,24 @@
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 
 #ifndef APTPKG_HASHSUM_TEMPLATE_H
 #define APTPKG_HASHSUM_TEMPLATE_H
 

-#include <apt-pkg/fileutl.h>

 
 #include <string>
 #include <cstring>
 
 #include <string>
 #include <cstring>

-#include <algorithm>
-#include <stdint.h>

 
 #include <apt-pkg/strutl.h>
 
 
 #include <apt-pkg/strutl.h>
 

+#ifndef APT_10_CLEANER_HEADERS
+#include <apt-pkg/fileutl.h>
+#include <algorithm>
+#include <stdint.h>
+#endif

 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
 #endif
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
 #endif
 

+class FileFd;
+

 template<int N>
 class HashSumValue
 {
 template<int N>
 class HashSumValue
 {


@@ -83,7 +87,7 @@ class HashSumValue
          Sum[I] = S[I];
    }
 
          Sum[I] = S[I];
    }
 

-   HashSumValue(std::string Str)
+   explicit HashSumValue(std::string const &Str)

    {
          memset(Sum,0,sizeof(Sum));
          Set(Str);
    {
          memset(Sum,0,sizeof(Sum));
          Set(Str);


@@ -104,7 +108,7 @@ class SummationImplementation
    inline bool Add(const unsigned char *Data)
    { return Add(Data, strlen((const char *)Data)); }
    inline bool Add(const char *Data)
    inline bool Add(const unsigned char *Data)
    { return Add(Data, strlen((const char *)Data)); }
    inline bool Add(const char *Data)

-   { return Add((const unsigned char *)Data, strlen((const char *)Data)); }
+   { return Add((const unsigned char *)Data, strlen(Data)); }

 
    inline bool Add(const unsigned char *Beg, const unsigned char *End)
    { return Add(Beg, End - Beg); }
 
    inline bool Add(const unsigned char *Beg, const unsigned char *End)
    { return Add(Beg, End - Beg); }