tests: activate dpkg multi-arch even if test is single arch

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

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index a8d55eb13d5a77e5f2e5fd0313ae48be29bab47d..1c5cb5aa17e6bd230e56ecf3413e272677fdace7 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -14,12 +14,13 @@
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 

+#include "hashsum_template.h"
+
+#ifndef APT_10_CLEANER_HEADERS

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

-
-#include "hashsum_template.h"
-
+#endif

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


@@ -36,7 +37,7 @@ class SHA1Summation : public SummationImplementation
    bool Done;
    
    public:
    bool Done;
    
    public:

-   bool Add(const unsigned char *inbuf, unsigned long long inlen);
+   bool Add(const unsigned char *inbuf, unsigned long long inlen) APT_OVERRIDE;

    using SummationImplementation::Add;
 
    SHA1SumValue Result();
    using SummationImplementation::Add;
 
    SHA1SumValue Result();