Apple-2-Tools
/
bradgrantham-apple2e
mirror of https://github.com/bradgrantham/apple2e.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compile errors caused by moving to range for

This commit is contained in:
Brad Grantham 2017-01-04 22:09:31 -08:00
parent c981363b4d
commit 2e7f809bc9
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apple2e.cpp
View File

@ -629,8 +629,7 @@ struct MAINboard : board_base
std::copy(rom_image + rom_C400.base - 0x8000, rom_image + rom_C400.base - 0x8000 + rom_C400.size, rom_C400.memory.begin());
std::copy(rom_image + rom_C800.base - 0x8000, rom_image + rom_C800.base - 0x8000 + rom_C800.size, rom_C800.memory.begin());
for(auto it : regions) {
backed_region* r = *it;
for(auto r : regions) {
int firstpage = r->base / 256;
int lastpage = (r->base + r->size + 255) / 256 - 1;
for(int i = firstpage; i <= lastpage; i++) {
@ -639,8 +638,7 @@ struct MAINboard : board_base
}
for(int i = 0; i < 256; i++)
switches_by_address[i] = NULL;
for(auto it : switches) {
SoftSwitch* sw = *it;
for(auto sw : switches) {
switches_by_address[sw->clear_address - 0xC000] = sw;
switches_by_address[sw->set_address - 0xC000] = sw;
switches_by_address[sw->read_address - 0xC000] = sw;
@ -670,8 +668,7 @@ struct MAINboard : board_base
virtual bool read(int addr, unsigned char &data)
{
if(debug & DEBUG_RW) printf("MAIN board read\n");
for(auto it : boards) {
board_base* b = *it;
for(auto b : boards) {
if(b->read(addr, data)) {
return true;
}
@ -779,8 +776,7 @@ struct MAINboard : board_base
printf("unhandled MMIO Read at %04X\n", addr);
fflush(stdout); exit(0);
}
for(auto it : regions_by_page[addr / 256]) {
backed_region* r = *it;
for(auto r : regions_by_page[addr / 256]) {
if(r->read(addr, data)) {
if(debug & DEBUG_RW) printf("read 0x%04X -> 0x%02X from %s\n", addr, data, r->name.c_str());
return true;
@ -798,8 +794,7 @@ struct MAINboard : board_base
if(exit_on_memory_fallthrough) {
printf("unhandled memory read at %04X, aborting\n", addr);
printf("Switches:\n");
for(auto it : switches) {
SoftSwitch* sw = *it;
for(auto sw : switches) {
printf(" %s: %s\n", sw->name.c_str(), sw->enabled ? "enabled" : "disabled");
}
exit(1);
@ -823,8 +818,7 @@ struct MAINboard : board_base
{
display_write(addr, write_to_aux_text1(), data);
}
for(auto it : boards) {
board_base* b = *it;
for(auto b : boards) {
if(b->write(addr, data)) {
return true;
}
@ -878,8 +872,7 @@ struct MAINboard : board_base
printf("unhandled MMIO Write at %04X\n", addr);
fflush(stdout); exit(0);
}
for(auto it : regions_by_page[addr / 256]) {
backed_region* r = *it;
for(auto r : regions_by_page[addr / 256]) {
if(r->write(addr, data)) {
if(debug & DEBUG_RW) printf("wrote %02X to 0x%04X in %s\n", addr, data, r->name.c_str());
return true;

3
interface.cpp
View File

@ -1095,8 +1095,7 @@ struct text_widget : public widget
// construct string texture
auto_ptr<unsigned char> bytes(new unsigned char[content.size() + 1]);
int i = 0;
for(auto it : content) {
unsigned char c = *it;
for(auto c : content) {
if(c >= ' ' && c <= '?')
bytes.get()[i] = c - ' ' + 160;
else if(c >= '@' && c <= '_')