zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-05-22 22:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Clément Le Bihan
2020-02-10 16:28:57 +01:00
parent 31373776e1
commit 0b442450a5
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/testMemoryBus.cpp
+1 -6
View File
@@ -355,13 +355,8 @@ Test(BusWrite, WritePPU)
{
auto pair = Init();
<<<<<<< HEAD
pair.first.write(0x002106, 123);
cr_assert_eq(pair.second.ppu->_mosaic.raw, 123);
=======
pair.first->write(0x002106, 123);
cr_assert_eq(pair.second.ppu->mosaic.raw, 123);
>>>>>>> aeb1e127f381998d0a572712afb43ef657f5024d
cr_assert_eq(pair.second.ppu->_mosaic.raw, 123);
}
Test(BusWrite, WriteCPU)