DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop __inline from conflicting declarations (#545)

Browse Source 
`mulnum` et al. are declared `extern` in `ratpak.h`, which conflicts
with the `__inline` used with them. Additionally, most similar functions
don't have such keyword applied to them.
This commit is contained in:
Michał Janiszewski 2019-06-10 23:36:05 +02:00 committed by Matt Cooley
parent fe30c7cabc
commit 81aec1ebe8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CalcManager/Ratpack/basex.cpp
View File

@ -34,7 +34,7 @@ void _mulnumx(PNUMBER* pa, PNUMBER b);
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void __inline mulnumx(PNUMBER* pa, PNUMBER b) void mulnumx(PNUMBER* pa, PNUMBER b)
{ {
if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0) if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0)
@ -215,7 +215,7 @@ void _divnumx(PNUMBER* pa, PNUMBER b, int32_t precision);
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void __inline divnumx(PNUMBER* pa, PNUMBER b, int32_t precision) void divnumx(PNUMBER* pa, PNUMBER b, int32_t precision)
{ {
if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0) if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0)

6
src/CalcManager/Ratpack/num.cpp
View File

@ -43,7 +43,7 @@ using namespace std;
void _addnum(PNUMBER* pa, PNUMBER b, uint32_t radix); void _addnum(PNUMBER* pa, PNUMBER b, uint32_t radix);
void __inline addnum(PNUMBER* pa, PNUMBER b, uint32_t radix) void addnum(PNUMBER* pa, PNUMBER b, uint32_t radix)
{ {
if (b->cdigit > 1 || b->mant[0] != 0) if (b->cdigit > 1 || b->mant[0] != 0)
@ -186,7 +186,7 @@ void _addnum(PNUMBER* pa, PNUMBER b, uint32_t radix)
void _mulnum(PNUMBER* pa, PNUMBER b, uint32_t radix); void _mulnum(PNUMBER* pa, PNUMBER b, uint32_t radix);
void __inline mulnum(PNUMBER* pa, PNUMBER b, uint32_t radix) void mulnum(PNUMBER* pa, PNUMBER b, uint32_t radix)
{ {
if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0) if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0)
@ -365,7 +365,7 @@ void remnum(PNUMBER* pa, PNUMBER b, uint32_t radix)
void _divnum(PNUMBER* pa, PNUMBER b, uint32_t radix, int32_t precision); void _divnum(PNUMBER* pa, PNUMBER b, uint32_t radix, int32_t precision);
void __inline divnum(PNUMBER* pa, PNUMBER b, uint32_t radix, int32_t precision) void divnum(PNUMBER* pa, PNUMBER b, uint32_t radix, int32_t precision)
{ {
if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0) if (b->cdigit > 1 || b->mant[0] != 1 || b->exp != 0)