COIN-OR::LEMON - Graph Library

Changeset 1396:61fdd06833a6 in lemon


Ignore:
Timestamp:
10/15/18 23:22:18 (10 months ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Phase:
public
Message:

Fix warnings emitted by VS2017 (#614)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/random.h

    r1340 r1396  
    343343          num = rnd() & mask;
    344344        } while (num > max);
    345         return num;
     345        return static_cast<Result>(num);
    346346      }
    347347    };
  • test/max_flow_test.cc

    r1385 r1396  
    420420  checkMaxFlowAlg<PType3, PreflowStartFunctions<PType3> >(test_lgf, 13);
    421421
    422   checkMaxFlowAlg<PType2, PreflowStartFunctions<PType2> >(test_lgf_float, 0.3);
     422  checkMaxFlowAlg<PType2, PreflowStartFunctions<PType2> >(test_lgf_float, 0.3f);
    423423  checkMaxFlowAlg<PType3, PreflowStartFunctions<PType3> >(test_lgf_float, 0.3);
    424424
     
    434434  checkMaxFlowAlg<EKType3, GeneralStartFunctions<EKType3> >(test_lgf, 13);
    435435
    436   checkMaxFlowAlg<EKType2, GeneralStartFunctions<EKType2> >(test_lgf_float, 0.3);
     436  checkMaxFlowAlg<EKType2, GeneralStartFunctions<EKType2> >(test_lgf_float, 0.3f);
    437437  checkMaxFlowAlg<EKType3, GeneralStartFunctions<EKType3> >(test_lgf_float, 0.3);
    438438
Note: See TracChangeset for help on using the changeset viewer.