Fix build

Author: Mysticial

Common/Cpp/Containers/SparseArray.cpp

@@ -20,7 +20,7 @@ void SparseArray::write(size_t address, size_t bytes, const void* data){
         m_data.emplace(
             std::piecewise_construct,
             std::forward_as_tuple(address),
-            std::forward_as_tuple((uint8_t*)data, (uint8_t*)data + bytes)
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
         );
         return;
     }
@@ -32,7 +32,7 @@ void SparseArray::write(size_t address, size_t bytes, const void* data){
         m_data.emplace(
             std::piecewise_construct,
             std::forward_as_tuple(address),
-            std::forward_as_tuple((uint8_t*)data, (uint8_t*)data + bytes)
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
         );
         return;
     }
@@ -43,7 +43,7 @@ void SparseArray::write(size_t address, size_t bytes, const void* data){
         m_data.emplace(
             std::piecewise_construct,
             std::forward_as_tuple(address),
-            std::forward_as_tuple((uint8_t*)data, (uint8_t*)data + bytes)
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
         );
         return;
     }
@@ -72,7 +72,7 @@ void SparseArray::write(size_t address, size_t bytes, const void* data){
     lowest = std::min(lowest, address);
     highest = std::max(highest, top);
 
-    std::vector<uint8_t> block(highest - lowest);
+    std::string block(highest - lowest, 0);
 
     //  Copy in the partial blocks.
     bool one_block = lower == upper;
@@ -161,7 +161,7 @@ void SparseArray::read(size_t address, size_t bytes, void* data) const{
 //        cout << "address = " << address << endl;
 //        cout << "block = " << block << endl;
 
-        const uint8_t* ptr = lower->second.data();
+        const char* ptr = lower->second.data();
         size_t len = lower->second.size();
 
         if (block < address){

Common/Cpp/Containers/SparseArray.h

@@ -7,17 +7,25 @@
 #ifndef PokemonAutomation_SparseArray_H
 #define PokemonAutomation_SparseArray_H
 
+#include <string.h>
 #include <string>
-#include <vector>
 #include <map>
 
 namespace PokemonAutomation{
 
 
 struct SparseArrayBlock{
     size_t address;
-    size_t bytes;
-    const void* data;
+    std::string data;
+
+    SparseArrayBlock(size_t p_address, const char* str)
+        : address(p_address)
+        , data(str, str + strlen(str))
+    {}
+    SparseArrayBlock(size_t p_address, std::initializer_list<char> p_data)
+        : address(p_address)
+        , data(p_data)
+    {}
 };
 
 
@@ -26,7 +34,7 @@ class SparseArray{
     SparseArray() = default;
     SparseArray(std::initializer_list<SparseArrayBlock> list){
         for (auto& item : list){
-            write(item.address, item.bytes, item.data);
+            write(item.address, item.data.size(), item.data.data());
         }
     }
 
@@ -42,15 +50,15 @@ class SparseArray{
             ret += " : ";
             ret += std::to_string(item.first + item.second.size());
             ret += "} = ";
-            ret += std::string((const char*)item.second.data(), item.second.size());
+            ret += item.second;
             ret += "\n";
         }
         return ret;
     }
 #endif
 
 private:
-    std::map<size_t, std::vector<uint8_t>> m_data;
+    std::map<size_t, std::string> m_data;
 };
 
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -273,9 +273,11 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
 
     using namespace std::chrono_literals;
 
+
+
     SparseArray data{
-        {100, 10, "0123456789"},
-        {120, 8, "asdfzxcv"},
+        {100, "0123456789"},
+        {120, {'a', 0x20, 'd'}},
     };
 //    data.set_data(100, "0123456789", 10);
 //    data.set_data(120, "asdfzxcv", 8);