Skip to content

Commit 9f33ac9

Browse files
committed
Merge remote-tracking branch 'origin/v100-bugfix' into v10-minor
2 parents 2213579 + e5513b9 commit 9f33ac9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/scip/rational.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,7 +1970,7 @@ SCIP_Longint SCIPrationalNumerator(
19701970
SCIP_RATIONAL* rational /**< the rational */
19711971
)
19721972
{
1973-
long result;
1973+
SCIP_Longint result;
19741974
scip::Integer numerator;
19751975

19761976
numerator = boost::multiprecision::numerator(rational->val);
@@ -1987,7 +1987,7 @@ SCIP_Longint SCIPrationalDenominator(
19871987
SCIP_RATIONAL* rational /**< the rational */
19881988
)
19891989
{
1990-
long result;
1990+
SCIP_Longint result;
19911991
scip::Integer denominator;
19921992

19931993
denominator = boost::multiprecision::denominator(rational->val);
@@ -2253,7 +2253,7 @@ void chooseSemiconv(
22532253
scip::Integer* p, /**< the last 3 numerators of convergents */
22542254
scip::Integer* q, /**< the last 3 denominators of convergents */
22552255
const scip::Integer& ai, /**< the coefficient in the continuous fraction */
2256-
long maxdenom /**< the maximal denominator */
2256+
SCIP_Longint maxdenom /**< the maximal denominator */
22572257
)
22582258
{
22592259
scip::Integer j = (scip::Integer(maxdenom) - q[0]) / q[1];
@@ -2277,8 +2277,8 @@ void chooseSemiconvLong(
22772277
SCIP_Longint& resden, /**< the resulting denominator */
22782278
const SCIP_Longint* p, /**< the last 3 numerators of convergents */
22792279
const SCIP_Longint* q, /**< the last 3 denominators of convergents */
2280-
long ai, /**< the coefficient in the continuous fraction */
2281-
long maxdenom /**< the maximal denominator */
2280+
SCIP_Longint ai, /**< the coefficient in the continuous fraction */
2281+
SCIP_Longint maxdenom /**< the maximal denominator */
22822282
)
22832283
{
22842284
SCIP_Longint j;

0 commit comments

Comments
 (0)