From 0e4ac8334d02ea256f750ad61689f28ff1ebdf6c Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Thu, 24 Aug 2017 16:55:15 +0200
Subject: Replace APT_CONST with APT_PURE everywhere

As a follow up to the last commit, let's replace APT_CONST
with APT_PURE everywhere to clean stuff up.
---
 apt-pkg/contrib/cmndline.h | 2 +-
 apt-pkg/contrib/crc-16.h   | 2 +-
 apt-pkg/contrib/hashes.h   | 4 ++--
 apt-pkg/contrib/strutl.cc  | 4 ++--
 apt-pkg/contrib/strutl.h   | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'apt-pkg/contrib')

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 805cb9eae..2751fb1db 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -92,7 +92,7 @@ class CommandLine
 	 unsigned int const argc, char const * const * const argv) APT_PURE;
 
    static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
-	 char const *ConfName, unsigned long Flags) APT_CONST;
+	 char const *ConfName, unsigned long Flags) APT_PURE;
 
    CommandLine();
    CommandLine(Args *AList,Configuration *Conf);
diff --git a/apt-pkg/contrib/crc-16.h b/apt-pkg/contrib/crc-16.h
index 6cc3556c6..228b00bc3 100644
--- a/apt-pkg/contrib/crc-16.h
+++ b/apt-pkg/contrib/crc-16.h
@@ -13,7 +13,7 @@
 #include <apt-pkg/macros.h>
 
 #define INIT_FCS  0xffff
-unsigned short AddCRC16Byte(unsigned short fcs, unsigned char byte) APT_CONST;
+unsigned short AddCRC16Byte(unsigned short fcs, unsigned char byte) APT_PURE;
 unsigned short AddCRC16(unsigned short fcs, void const *buf,
 			unsigned long long len) APT_PURE;
 
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index 1f8f45cb1..11521008a 100644
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -72,7 +72,7 @@ class HashString
    bool operator!=(HashString const &other) const;
 
    // return the list of hashes we support
-   static APT_CONST const char** SupportedHashes();
+   static APT_PURE const char** SupportedHashes();
 };
 
 class HashStringList
@@ -225,7 +225,7 @@ APT_IGNORE_DEPRECATED_PUSH
 APT_IGNORE_DEPRECATED_POP
 
    private:
-   APT_HIDDEN APT_CONST inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512)
+   APT_HIDDEN APT_PURE inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512)
    {
       unsigned int Hashes = ~0;
       if (addMD5 == false) Hashes &= ~MD5SUM;
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 964f0d6c6..f2fc0b6a6 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -1482,7 +1482,7 @@ string StripEpoch(const string &VerStr)
    standard tolower/toupper and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
 #undef tolower_ascii
-int tolower_ascii(int const c) APT_CONST APT_COLD;
+int tolower_ascii(int const c) APT_PURE APT_COLD;
 int tolower_ascii(int const c)
 {
    return tolower_ascii_inline(c);
@@ -1496,7 +1496,7 @@ int tolower_ascii(int const c)
    standard isspace() and as a bonus avoids problems with different
    locales - we only operate on ascii chars anyway. */
 #undef isspace_ascii
-int isspace_ascii(int const c) APT_CONST APT_COLD;
+int isspace_ascii(int const c) APT_PURE APT_COLD;
 int isspace_ascii(int const c)
 {
    return isspace_ascii_inline(c);
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index cc39521da..f76fbd4ab 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -130,7 +130,7 @@ std::vector<std::string> VectorizeString(std::string const &haystack, char const
  */
 std::vector<std::string> StringSplit(std::string const &input, 
                                      std::string const &sep, 
-                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) APT_CONST;
+                                     unsigned int maxsplit=std::numeric_limits<unsigned int>::max()) APT_PURE;
 
 void ioprintf(std::ostream &out,const char *format,...) APT_PRINTF(2);
 void strprintf(std::string &out,const char *format,...) APT_PRINTF(2);
@@ -141,17 +141,17 @@ bool CheckDomainList(const std::string &Host, const std::string &List);
 #define tolower_ascii  tolower_ascii_inline
 #define isspace_ascii  isspace_ascii_inline
 
-APT_CONST APT_HOT
+APT_PURE APT_HOT
 static inline int tolower_ascii_unsafe(int const c)
 {
    return c | 0x20;
 }
-APT_CONST APT_HOT
+APT_PURE APT_HOT
 static inline int tolower_ascii_inline(int const c)
 {
    return (c >= 'A' && c <= 'Z') ? c + 32 : c;
 }
-APT_CONST APT_HOT
+APT_PURE APT_HOT
 static inline int isspace_ascii_inline(int const c)
 {
    // 9='\t',10='\n',11='\v',12='\f',13='\r',32=' '
-- 
cgit v1.2.3