Skip to content

Commit fee4ab2

Browse files
committed
intermediate cast to size_t instead of long for convert int->void*
- to fix MSVC warning C4312: 'type cast': conversion from 'long' to 'void *' of greater size
1 parent 3e0d412 commit fee4ab2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/scip/prop_symmetry.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3957,8 +3957,8 @@ SCIP_RETCODE addWeakSBCsSubgroup(
39573957
{
39583958
/* add element from lexorder to hashmap.
39593959
* Use insert, as duplicate entries in lexorder is not permitted. */
3960-
assert( ! SCIPhashmapExists(varsinlexorder, (void*) (long) (*lexorder)[k]) ); /* Use int as pointer */
3961-
SCIP_CALL( SCIPhashmapInsertInt(varsinlexorder, (void*) (long) (*lexorder)[k], k) );
3960+
assert( ! SCIPhashmapExists(varsinlexorder, (void*) (size_t) (*lexorder)[k]) ); /* Use int as pointer */
3961+
SCIP_CALL( SCIPhashmapInsertInt(varsinlexorder, (void*) (size_t) (*lexorder)[k], k) );
39623962
}
39633963
}
39643964

@@ -3987,7 +3987,7 @@ SCIP_RETCODE addWeakSBCsSubgroup(
39873987

39883988
/* If varidx is in lexorder, then it must be the first entry of lexorder. */
39893989
if ( varsinlexorder != NULL
3990-
&& SCIPhashmapExists(varsinlexorder, (void*) (long) varidx)
3990+
&& SCIPhashmapExists(varsinlexorder, (void*) (size_t) varidx)
39913991
&& lexorder != NULL && *lexorder != NULL && *maxnvarsorder > 0 && *nvarsorder > 0
39923992
&& (*lexorder)[0] != varidx )
39933993
continue;
@@ -4097,13 +4097,13 @@ SCIP_RETCODE addWeakSBCsSubgroup(
40974097
if ( varidx == (*lexorder)[0] )
40984098
{
40994099
/* lexorder is already ok!! */
4100-
assert( SCIPhashmapExists(varsinlexorder, (void*) (long) varidx) );
4100+
assert( SCIPhashmapExists(varsinlexorder, (void*) (size_t) varidx) );
41014101
}
41024102
else
41034103
{
41044104
/* Then varidx must not be in the lexorder,
41054105
* We must add it at the front of the array, and maintain the current order. */
4106-
assert( ! SCIPhashmapExists(varsinlexorder, (void*) (long) varidx) );
4106+
assert( ! SCIPhashmapExists(varsinlexorder, (void*) (size_t) varidx) );
41074107

41084108
++(*maxnvarsorder);
41094109
++(*nvarsorder);

0 commit comments

Comments
 (0)