Replace ULONG -> uint32_t

This commit is contained in:
Michał Janiszewski 2019-03-08 22:06:33 +01:00
commit bc5af2b37e
3 changed files with 6 additions and 6 deletions

View file

@ -28,7 +28,7 @@ namespace CalcEngine
PNUMBER Number::ToPNUMBER() const 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->sign = this->Sign();
ret->exp = this->Exp(); ret->exp = this->Exp();
ret->cdigit = static_cast<long>(this->Mantissa().size()); ret->cdigit = static_cast<long>(this->Mantissa().size());

View file

@ -125,11 +125,11 @@ void _destroyrat( _In_ PRAT prat )
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
PNUMBER _createnum( _In_ ULONG size ) PNUMBER _createnum( _In_ uint32_t size )
{ {
PNUMBER pnumret= nullptr; PNUMBER pnumret= nullptr;
ULONG cbAlloc; uint32_t cbAlloc;
// sizeof( MANTTYPE ) is the size of a 'digit' // sizeof( MANTTYPE ) is the size of a 'digit'
if (SUCCEEDED(ULongAdd(size, 1, &cbAlloc)) && 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 long expValue = 0L; // expValue is exponent mantissa, should be unsigned
PNUMBER pnumret = nullptr; PNUMBER pnumret = nullptr;
createnum(pnumret, static_cast<ULONG>(numberString.length())); createnum(pnumret, static_cast<uint32_t>(numberString.length()));
pnumret->sign = 1L; pnumret->sign = 1L;
pnumret->cdigit = 0; pnumret->cdigit = 0;
pnumret->exp = 0; pnumret->exp = 0;
@ -797,7 +797,7 @@ PNUMBER longtonum( long inlong, uint32_t radix)
// //
// FUNCTION: Ulongtonum // FUNCTION: Ulongtonum
// //
// ARGUMENTS: ULONG input and radix requested. // ARGUMENTS: uint32_t input and radix requested.
// //
// RETURN: number // RETURN: number
// //

View file

@ -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 numtolong(_In_ PNUMBER pnum, uint32_t radix );
extern long rattolong(_In_ PRAT prat, uint32_t radix, int32_t precision); extern long rattolong(_In_ PRAT prat, uint32_t radix, int32_t precision);
ULONGLONG rattoUlonglong(_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 nRadixxtonum(_In_ PNUMBER a, uint32_t radix, int32_t precision);
extern PNUMBER gcd(_In_ PNUMBER a, _In_ PNUMBER b ); 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. extern PNUMBER StringToNumber(std::wstring_view numberString, uint32_t radix, int32_t precision); // takes a text representation of a number and returns a number.