From 20fd786e42e58ae7c7fecd1a951408918954a43b Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 12 May 2019 11:28:45 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/development' # Conflicts: # include/etl/memory.h # include/etl/version.h # support/Release notes.txt # test/test_memory.cpp --- test/test_memory.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/test_memory.cpp b/test/test_memory.cpp index 88c38387..68a62caa 100644 --- a/test/test_memory.cpp +++ b/test/test_memory.cpp @@ -578,13 +578,6 @@ namespace char d2; }; - Data data = { 0xFFFFFFFF, char(0xFF) }; - - etl::memory_set(data, 0x5A); - - CHECK_EQUAL(0x5A5A5A5A, data.d1); - CHECK_EQUAL(0x5A, data.d2); -======= Data data[3] = { { 0xFFFFFFFF, char(0xFF) }, { 0xFFFFFFFF, char(0xFF) }, { 0xFFFFFFFF, char(0xFF) } }; etl::memory_clear_range(std::begin(data), std::end(data));