use a=experimental instead n=experimental in pin documentation

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 25631b1668058749ba0dc7e93e729e055f3e6ea1..a16ea4d2d673dd09a73a567b2478b669548552ab 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -10,7 +10,7 @@
    store a MD5Sum in 16 bytes of memory.
    
    A MD5Sum is used to generate a (hopefully) unique 16 byte number for a
    store a MD5Sum in 16 bytes of memory.
    
    A MD5Sum is used to generate a (hopefully) unique 16 byte number for a

-   block of data. This can be used to gaurd against corruption of a file.
+   block of data. This can be used to guard against corruption of a file.

    MD5 should not be used for tamper protection, use SHA or something more
    secure.
    
    MD5 should not be used for tamper protection, use SHA or something more
    secure.
    


@@ -23,14 +23,15 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 

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

 #include <stdint.h>
 
 #include "hashsum_template.h"
 
 #include <stdint.h>
 
 #include "hashsum_template.h"
 

+#ifndef APT_10_CLEANER_HEADERS
+#include <string>
+#include <cstring>
+#include <algorithm>
+#endif

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


@@ -47,7 +48,7 @@ class MD5Summation : public SummationImplementation
 
    public:
 
 
    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;
 
    MD5SumValue Result();
    using SummationImplementation::Add;
 
    MD5SumValue Result();