Release 3.1.1.4

Fix variable cast
morbac · Apr 28, 2021 · b824762 · b824762
1 parent a4b4a71
commit b824762
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/ToolsErrors.cpp b/ToolsErrors.cpp
@@ -377,7 +377,7 @@ void displayXMLErrors(std::vector<ErrorEntryType> errors, HWND view, const wchar
         Report::registerMessage(L"");
 
         for (std::vector<ErrorEntryType>::iterator it = errors.begin(); it != errors.end(); ++it) {
-            if (xmltoolsoptions.maxErrorsNum >= 0 && it - errors.begin() >= xmltoolsoptions.maxErrorsNum) {
+            if (xmltoolsoptions.maxErrorsNum >= 0 && (it - errors.begin()) >= xmltoolsoptions.maxErrorsNum) {
                 size_t nerrors = errors.end() - it;
                 if (nerrors > 1) Report::registerMessage(Report::str_format(L"%d errors follow but are not displayed", nerrors).c_str());
                 else Report::registerMessage(Report::str_format(L"1 error follows but is not displayed").c_str());
@@ -408,7 +408,7 @@ void displayXMLErrors(std::vector<ErrorEntryType> errors, HWND view, const wchar
     }
     else {
         for (std::vector<ErrorEntryType>::iterator it = errors.begin(); it != errors.end(); ++it) {
-            if (xmltoolsoptions.maxErrorsNum >= 0 && it - errors.begin() >= xmltoolsoptions.maxErrorsNum) break;
+            if (xmltoolsoptions.maxErrorsNum >= 0 && (it - errors.begin()) >= xmltoolsoptions.maxErrorsNum) break;
 
             if ((*it).line < 0) {
                 std::wstring text = (*it).reason;
@@ -457,6 +457,6 @@ void clearErrors(HWND view) {
 
 void registerError(ErrorEntryDesc err) {
     LRESULT bufferid = ::SendMessage(nppData._nppHandle, NPPM_GETCURRENTBUFFERID, 0, 0);
-    if (xmltoolsoptions.maxErrorsNum >= 0 && xmlErrors.size() > xmltoolsoptions.maxErrorsNum) return;
+    if (xmltoolsoptions.maxErrorsNum >= 0 && xmlErrors.size() > (size_t) xmltoolsoptions.maxErrorsNum) return;
     xmlErrors[bufferid].push_back(err);
 }
diff --git a/XMLTools.h b/XMLTools.h
@@ -21,7 +21,7 @@
 
 //---------------------------------------------------------------------------
 
-#define XMLTOOLS_VERSION_NUMBER L"3.1.1.3"
+#define XMLTOOLS_VERSION_NUMBER L"3.1.1.4"
 #define XMLTOOLS_HOMEPAGE_URL L"https://github.com/morbac/xmltools"
 #ifdef V64BIT
 #define XMLTOOLS_VERSION_STATUS L"unicode 64bit"

diff --git a/XMLTools.rc b/XMLTools.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,1,1,3
- PRODUCTVERSION 3,1,1,3
+ FILEVERSION 3,1,1,4
+ PRODUCTVERSION 3,1,1,4
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -42,12 +42,12 @@ BEGIN
         BLOCK "040004b0"
         BEGIN
             VALUE "FileDescription", "XMLTools"
-            VALUE "FileVersion", "3.1.1.3"
+            VALUE "FileVersion", "3.1.1.4"
             VALUE "InternalName", "XMLTools"
             VALUE "LegalCopyright", "Copyright (C) 2005-2021"
             VALUE "OriginalFilename", "XMLTools.dll"
             VALUE "ProductName", "XMLTools"
-            VALUE "ProductVersion", "3.1.1.3"
+            VALUE "ProductVersion", "3.1.1.4"
         END
     END
     BLOCK "VarFileInfo"