Fix signed/unsigned warnings with explicit casts.
This commit is contained in:
parent
36826a3b66
commit
8ed15267a5
@ -723,7 +723,7 @@ unsigned cw::lex::getNextToken( handle_t h )
|
||||
}
|
||||
|
||||
// update the lexer state
|
||||
p->curTokenId = maxIdx==kInvalidIdx ? kUnknownLexTId : p->mfp[ maxIdx ].typeId;
|
||||
p->curTokenId = maxIdx==kInvalidIdx ? (unsigned)kUnknownLexTId : p->mfp[ maxIdx ].typeId;
|
||||
p->curTokenCharIdx = p->ci;
|
||||
p->curTokenCharCnt = maxCharCnt;
|
||||
|
||||
|
@ -670,7 +670,7 @@ cw::rc_t cw::score_follower::write_sync_perf_csv( handle_t h, const char* out_fn
|
||||
sectionLabel = e->section != nullptr ? e->section->label : "";
|
||||
curBarNumb = std::max(bar,curBarNumb);
|
||||
dlevel = e->dynLevel;
|
||||
loc = resultA[i].oLocId == kInvalidId ? score_parse::kInvalidLocId : resultA[i].oLocId;
|
||||
loc = resultA[i].oLocId == kInvalidId ? (unsigned)score_parse::kInvalidLocId : resultA[i].oLocId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -218,7 +218,7 @@ namespace cw
|
||||
// write the ref-note
|
||||
for(ssf_ref_note_t* rn=r->refNoteL; rn!=nullptr; rn = rn->link)
|
||||
{
|
||||
unsigned pitch = rn->evt == nullptr ? midi::kInvalidMidiPitch : rn->evt->pitch;
|
||||
unsigned pitch = rn->evt == nullptr ? (unsigned)midi::kInvalidMidiPitch : rn->evt->pitch;
|
||||
unsigned cnt = rn->cnt > 1 ? rn->cnt : kInvalidCnt;
|
||||
bool noMatchFl = rn->cnt == 0;
|
||||
if((rc = _write_rect_pitch( p, r->left-offset_x, rn->top, "ref_note", pitch, noMatchFl, cnt, rn->cwLocId )) != kOkRC )
|
||||
|
@ -57,14 +57,14 @@ cw::time::spec_t cw::time::current_time()
|
||||
#endif
|
||||
|
||||
unsigned long long cw::time::elapsedMicros( const spec_t& t0, const spec_t& t1 )
|
||||
{
|
||||
{
|
||||
const unsigned long long ns_per_sec = 1000000000;
|
||||
const unsigned long long us_per_sec = 1000000;
|
||||
const unsigned long long ns_per_us = 1000;
|
||||
|
||||
// we assume that the time is normalized
|
||||
assert( t0.tv_nsec < (const long long)ns_per_sec );
|
||||
assert( t1.tv_nsec < (const long long)ns_per_sec );
|
||||
assert( t0.tv_nsec < (long long)ns_per_sec );
|
||||
assert( t1.tv_nsec < (long long)ns_per_sec );
|
||||
|
||||
if( t0.tv_sec > t1.tv_sec )
|
||||
{
|
||||
|
@ -705,7 +705,7 @@ namespace cw
|
||||
cw::rc_t _set_pitch( vtbl_t* p, unsigned vseqPitch )
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
if( 0<= vseqPitch && vseqPitch < 128)
|
||||
if( vseqPitch < 128)
|
||||
p->vseqPitch = vseqPitch;
|
||||
else
|
||||
{
|
||||
@ -716,7 +716,7 @@ namespace cw
|
||||
|
||||
cw::rc_t _validate_midi_value( vtbl_t* p, unsigned midiValue )
|
||||
{
|
||||
if( 0 <= midiValue && midiValue < 128 )
|
||||
if( midiValue < 128 )
|
||||
return kOkRC;
|
||||
|
||||
return _set_status(p,kInvalidArgRC,"%i is an invalid 8 bit MIDI value.",midiValue);
|
||||
|
Loading…
Reference in New Issue
Block a user