UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-22 23:30:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Clean Macro in integer

Browse Source 
Change-Id: I0e9ebe49921269b3812e9e7a1f496465e52738aa
This commit is contained in:
Émilie Feral
2017-09-25 15:04:44 +02:00
parent 0979a26685
commit c1a65654d7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
poincare/src/integer.cpp
View File

@@ -9,12 +9,9 @@ extern "C" {
#include "layout/string_layout.h"
#include <utility>
#define MAX(a,b) ((a)>(b)?a:b)
namespace Poincare {
// Helper functions
static inline int max(int x, int y) { return (x>y ? x : y); }
uint8_t log2(Integer::native_uint_t v) {
constexpr int nativeUnsignedIntegerBitCount = 8*sizeof(Integer::native_uint_t);
@@ -251,7 +248,7 @@ int8_t Integer::ucmp(const Integer & a, const Integer & b) {
}
Integer Integer::usum(const Integer & a, const Integer & b, bool subtract, bool outputNegative) {
uint16_t size = MAX(a.m_numberOfDigits, b.m_numberOfDigits);
uint16_t size = max(a.m_numberOfDigits, b.m_numberOfDigits);
if (!subtract) {
// Addition can overflow
size += 1;