Codechange: Replaced SmallVector::[Begin|End]() with std alternatives

This commit is contained in:
Henry Wilson
2019-02-17 11:20:52 +00:00
committed by PeterN
parent 297fd3dda3
commit ab711e6942
75 changed files with 464 additions and 555 deletions

View File

@@ -751,7 +751,7 @@ static void MidiThreadProc(void *)
block_time = playback_start_time + block.realtime * MIDITIME_TO_REFTIME;
DEBUG(driver, 9, "DMusic thread: Streaming block " PRINTF_SIZE " (cur=" OTTD_PRINTF64 ", block=" OTTD_PRINTF64 ")", current_block, (long long)(current_time / MS_TO_REFTIME), (long long)(block_time / MS_TO_REFTIME));
byte *data = block.data.Begin();
byte *data = block.data.data();
size_t remaining = block.data.size();
byte last_status = 0;
while (remaining > 0) {

View File

@@ -336,7 +336,7 @@ static bool FixupMidiData(MidiFile &target)
last_ticktime = block.ticktime;
} else {
byte *datadest = grow(merged_blocks.back().data, block.data.size());
memcpy(datadest, block.data.Begin(), block.data.size());
memcpy(datadest, block.data.data(), block.data.size());
}
}
std::swap(merged_blocks, target.blocks);
@@ -940,8 +940,8 @@ bool MidiFile::WriteSMF(const char *filename)
}
/* Write each block data command */
byte *dp = block.data.Begin();
while (dp < block.data.End()) {
byte *dp = block.data.data();
while (dp < block.data.data() + block.data.size()) {
/* Always zero delta time inside blocks */
if (needtime) {
fputc(0, f);

View File

@@ -229,7 +229,7 @@ void CALLBACK TimerCallback(UINT uTimerID, UINT, DWORD_PTR dwUser, DWORD_PTR, DW
break;
}
byte *data = block.data.Begin();
byte *data = block.data.data();
size_t remaining = block.data.size();
byte last_status = 0;
while (remaining > 0) {