Merge pull request #2538 from tautschnig/vs-use-to_ulong

tautschnig · web-flow · commit 0da9766f10d3 · 2018-07-07T11:34:12.000+01:00
Use to_ulong instead of the deprecated integer2ulong
diff --git a/src/util/mp_arith.cpp b/src/util/mp_arith.cpp
@@ -195,14 +195,16 @@ mp_integer::ullong_t integer2ulong(const mp_integer &n)
 std::size_t integer2size_t(const mp_integer &n)
 {
   PRECONDITION(n>=0 && n<=std::numeric_limits<std::size_t>::max());
-  mp_integer::ullong_t ull=integer2ulong(n);
+  PRECONDITION(n.is_ulong());
+  mp_integer::ullong_t ull = n.to_ulong();
   return (std::size_t) ull;
 }
 
 unsigned integer2unsigned(const mp_integer &n)
 {
   PRECONDITION(n>=0 && n<=std::numeric_limits<unsigned>::max());
-  mp_integer::ullong_t ull=integer2ulong(n);
+  PRECONDITION(n.is_ulong());
+  mp_integer::ullong_t ull = n.to_ulong();
   return (unsigned)ull;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -195,14 +195,16 @@ mp_integer::ullong_t integer2ulong(const mp_integer &n)`
`195`	`195`	`std::size_t integer2size_t(const mp_integer &n)`
`196`	`196`	`{`
`197`	`197`	`PRECONDITION(n>=0 && n<=std::numeric_limits<std::size_t>::max());`
`198`		`- mp_integer::ullong_t ull=integer2ulong(n);`
	`198`	`+ PRECONDITION(n.is_ulong());`
	`199`	`+ mp_integer::ullong_t ull = n.to_ulong();`
`199`	`200`	`return (std::size_t) ull;`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`unsigned integer2unsigned(const mp_integer &n)`
`203`	`204`	`{`
`204`	`205`	`PRECONDITION(n>=0 && n<=std::numeric_limits<unsigned>::max());`
`205`		`- mp_integer::ullong_t ull=integer2ulong(n);`
	`206`	`+ PRECONDITION(n.is_ulong());`
	`207`	`+ mp_integer::ullong_t ull = n.to_ulong();`
`206`	`208`	`return (unsigned)ull;`
`207`	`209`	`}`
`208`	`210`