__deprecated is already defined by sys/cdefs.h :/.

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index a207da4e4f8d6615379549cf900f1d8ea4cfbe8e..a286f092aa0b6bf1e264b9e541657249bc7a9a85 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,13 +23,19 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 

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

 
 

+#ifndef APT_10_CLEANER_HEADERS

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

-#include <stdint.h>
-
-#include "hashsum_template.h"
+#endif
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+using std::min;
+#endif

 
 typedef HashSumValue<128> MD5SumValue;
 
 
 typedef HashSumValue<128> MD5SumValue;
 


@@ -42,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 APT_NONNULL(2);

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