From aa5b960ace514e036d932f6a45dc0c3a81f0db4a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 16 5月 2020 21:54:27 +0800
Subject: [PATCH] Merge branch 'develop' of https://github.com/open-license-manager/open-license-manager.git into develop

---
 src/library/base/base64.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library/base/base64.cpp b/src/library/base/base64.cpp
index 2245be1..caa0ddc 100644
--- a/src/library/base/base64.cpp
+++ b/src/library/base/base64.cpp
@@ -49,7 +49,7 @@
 	const unsigned char* bin = (const unsigned char*)binaryData;
 
 	int rc = 0;  // result counter
-	int byteNo;  // I need this after the loop
+	unsigned int byteNo;  // I need this after the loop
 
 	int modulusLen = len % 3;
 	int pad = ((modulusLen & 1) << 1) + ((modulusLen & 2) >> 1);  // 2 gives 1 and 1 gives 2, but 0 gives 0.
@@ -109,7 +109,7 @@
 	const unsigned char* safeAsciiPtr = (const unsigned char*)tmp_str.c_str();
 	std::vector<uint8_t> bin;
 	int cb = 0;
-	int charNo;
+	unsigned int charNo;
 	int pad = 0;
 	size_t len = tmp_str.size();
 

--
Gitblit v1.9.1