From 49f0b0122f6c08a9c9cd53276ee596da17796279 Mon Sep 17 00:00:00 2001 From: sdottaka Date: Sun, 11 Oct 2015 00:29:13 +0900 Subject: [PATCH] Replace UINT with unsigned --- Src/DirActions.cpp | 2 +- Src/stringdiffs.cpp | 8 ++++---- Src/stringdiffsi.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index 880915a35..634a4d158 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -1093,7 +1093,7 @@ void SetItemViewFlag(CDiffContext& ctxt, unsigned flag, unsigned mask) while (pos != NULL) { - UINT curFlags = ctxt.GetCustomFlags1(pos); + unsigned curFlags = ctxt.GetCustomFlags1(pos); curFlags &= ~mask; // Zero bits masked curFlags |= flag; ctxt.SetCustomFlags1(pos, curFlags); diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp index 405e6d98e..4737b4e4c 100644 --- a/Src/stringdiffs.cpp +++ b/Src/stringdiffs.cpp @@ -465,19 +465,19 @@ stringdiffs::PopulateDiffs() /* Given a hash value and a new character, return a new hash value. */ #define HASH(h, c) ((c) + ROL (h, 7)) -UINT -stringdiffs::Hash(const String & str, int begin, int end, UINT h) const +unsigned +stringdiffs::Hash(const String & str, int begin, int end, unsigned h) const { for (int i = begin; i <= end; ++i) { - UINT ch = (UINT)str[i]; + unsigned ch = static_cast(str[i]); if (m_case_sensitive) { h += HASH(h, ch); } else { - ch = (UINT)_totupper(ch); + ch = static_cast(_totupper(ch)); h += HASH(h, ch); } } diff --git a/Src/stringdiffsi.h b/Src/stringdiffsi.h index d46b79ee9..23927d510 100644 --- a/Src/stringdiffsi.h +++ b/Src/stringdiffsi.h @@ -66,7 +66,7 @@ private: private: void BuildWordsArray(const String & str, std::vector& words); - UINT Hash(const String & str, int begin, int end, UINT h ) const; + unsigned Hash(const String & str, int begin, int end, unsigned h ) const; bool AreWordsSame(const word & word1, const word & word2) const; bool IsWord(const word & word1) const; /** -- 2.11.0