From bc5af2b37edd531ceb5d734d1b7a6a4e6e82a859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur+signed@gmail.com>
Date: Fri, 8 Mar 2019 22:06:33 +0100
Subject: [PATCH] Replace ULONG -> uint32_t

---
 src/CalcManager/CEngine/Number.cpp | 2 +-
 src/CalcManager/Ratpack/conv.cpp   | 8 ++++----
 src/CalcManager/Ratpack/ratpak.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CalcManager/CEngine/Number.cpp b/src/CalcManager/CEngine/Number.cpp
index 0d809917..e175b270 100644
--- a/src/CalcManager/CEngine/Number.cpp
+++ b/src/CalcManager/CEngine/Number.cpp
@@ -28,7 +28,7 @@ namespace CalcEngine
 
     PNUMBER Number::ToPNUMBER() const
     {
-        PNUMBER ret = _createnum(static_cast<ULONG>(this->Mantissa().size()) + 1);
+        PNUMBER ret = _createnum(static_cast<uint32_t>(this->Mantissa().size()) + 1);
         ret->sign = this->Sign();
         ret->exp = this->Exp();
         ret->cdigit = static_cast<long>(this->Mantissa().size());
diff --git a/src/CalcManager/Ratpack/conv.cpp b/src/CalcManager/Ratpack/conv.cpp
index ca69b844..2be79ceb 100644
--- a/src/CalcManager/Ratpack/conv.cpp
+++ b/src/CalcManager/Ratpack/conv.cpp
@@ -125,11 +125,11 @@ void _destroyrat( _In_ PRAT prat )
 //
 //-----------------------------------------------------------------------------
 
-PNUMBER _createnum( _In_ ULONG size )
+PNUMBER _createnum( _In_ uint32_t size )
 
 {
     PNUMBER pnumret= nullptr;
-    ULONG cbAlloc;
+    uint32_t cbAlloc;
 
     // sizeof( MANTTYPE ) is the size of a 'digit'
     if (SUCCEEDED(ULongAdd(size, 1, &cbAlloc)) &&
@@ -578,7 +578,7 @@ PNUMBER StringToNumber(wstring_view numberString, uint32_t radix, int32_t precis
     long expValue = 0L;          // expValue is exponent mantissa, should be unsigned
 
     PNUMBER pnumret = nullptr;
-    createnum(pnumret, static_cast<ULONG>(numberString.length()));
+    createnum(pnumret, static_cast<uint32_t>(numberString.length()));
     pnumret->sign = 1L;
     pnumret->cdigit = 0;
     pnumret->exp = 0;
@@ -797,7 +797,7 @@ PNUMBER longtonum( long inlong, uint32_t radix)
 //
 //    FUNCTION: Ulongtonum
 //
-//    ARGUMENTS: ULONG input and radix requested.
+//    ARGUMENTS: uint32_t input and radix requested.
 //
 //    RETURN: number
 //
diff --git a/src/CalcManager/Ratpack/ratpak.h b/src/CalcManager/Ratpack/ratpak.h
index 8ec3fe5b..21707bbd 100644
--- a/src/CalcManager/Ratpack/ratpak.h
+++ b/src/CalcManager/Ratpack/ratpak.h
@@ -324,7 +324,7 @@ extern void flatrat(_Inout_ PRAT& prat, uint32_t radix, int32_t precision);
 extern long numtolong(_In_ PNUMBER pnum, uint32_t radix );
 extern long rattolong(_In_ PRAT prat, uint32_t radix, int32_t precision);
 ULONGLONG rattoUlonglong(_In_ PRAT prat, uint32_t radix, int32_t precision);
-extern PNUMBER _createnum(_In_ ULONG size ); // returns an empty number structure with size digits
+extern PNUMBER _createnum(_In_ uint32_t size ); // returns an empty number structure with size digits
 extern PNUMBER nRadixxtonum(_In_ PNUMBER a, uint32_t radix, int32_t precision);
 extern PNUMBER gcd(_In_ PNUMBER a, _In_ PNUMBER b );
 extern PNUMBER StringToNumber(std::wstring_view numberString, uint32_t radix, int32_t precision); // takes a text representation of a number and returns a number.