diff --git a/ttmath/ttmathparser.h b/ttmath/ttmathparser.h index 42cd940..a7f39d2 100644 --- a/ttmath/ttmathparser.h +++ b/ttmath/ttmathparser.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2006-2014, Tomasz Sowa + * Copyright (c) 2006-2017, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1781,7 +1781,7 @@ Conv conv; /*! this method returns true if 'character' is a proper first digit for the value (or a comma -- can be first too) */ -bool ValueStarts(int character, int base) +bool ValueStarts(int character, int character_base) { if( character == comma ) return true; @@ -1789,7 +1789,7 @@ bool ValueStarts(int character, int base) if( comma2!=0 && character==comma2 ) return true; - if( Misc::CharToDigit(character, base) != -1 ) + if( Misc::CharToDigit(character, character_base) != -1 ) return true; return false; diff --git a/ttmath/ttmathuint.h b/ttmath/ttmathuint.h index 2110481..43d68c1 100644 --- a/ttmath/ttmathuint.h +++ b/ttmath/ttmathuint.h @@ -3319,7 +3319,7 @@ public: if( negative ) result = '-'; - digits_d = table_id; // for not making an overflow in uint type + digits_d = static_cast(table_id); // for not making an overflow in uint type digits_d *= TTMATH_BITS_PER_UINT; digits_d += index + 1; digits_d *= ToStringLog2(b); diff --git a/ttmath/win64_assemble.bat b/ttmath/win64_assemble.bat new file mode 100644 index 0000000..8d441ff --- /dev/null +++ b/ttmath/win64_assemble.bat @@ -0,0 +1,9 @@ +rem make sure this is a proper path to the 64 bit assembler +"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\ml64.exe" /c ttmathuint_x86_64_msvc.asm +rem ml64.exe will produce ttmathuint_x86_64_msvc.obj which should be added (linked) to your project + +rem or you can assemble with debug info +rem ml64.exe /c /Zd /Zi ttmathuint_x86_64_msvc.asm + +rem be nice, most Windows users just click on the file +pause