From 433ae34e557debd7d864590cae0ced57e7736c53 Mon Sep 17 00:00:00 2001 From: Thomas Brain Date: Thu, 25 Aug 2022 11:05:26 -0500 Subject: [PATCH 1/2] Fix clearing arrays of strings (#1337) #1335 --- .../sim_services/MemoryManager/MemoryManager_clear_memory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp index 32ff066c..46e17d36 100644 --- a/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp +++ b/trick_source/sim_services/MemoryManager/MemoryManager_clear_memory.cpp @@ -92,7 +92,7 @@ void Trick::MemoryManager::clear_rvalue( void* base_address, ATTRIBUTES* attr, i *(void**)final_address = (void*)NULL; break; case TRICK_STRING : - final_address = (char*)base_address + offset * sizeof(void*); + final_address = (char*)base_address + offset * sizeof(std::string); *(std::string*)final_address = ""; break; case TRICK_STL : From bcaaeedd894cfef66e3958e9ec47ad82a4c8c654 Mon Sep 17 00:00:00 2001 From: Jacqueline Deans Date: Fri, 26 Aug 2022 11:51:25 -0500 Subject: [PATCH 2/2] Fix syntax on job_class_order docs --- .../Simulation-Definition-File.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/documentation/building_a_simulation/Simulation-Definition-File.md b/docs/documentation/building_a_simulation/Simulation-Definition-File.md index c603e073..becbd673 100644 --- a/docs/documentation/building_a_simulation/Simulation-Definition-File.md +++ b/docs/documentation/building_a_simulation/Simulation-Definition-File.md @@ -381,11 +381,11 @@ in the table is the default ordering. ```C++ job_class_order { - my_job_class_1 ; - my_job_class_2 ; - scheduled ; - my_job_class_3 ; -} + my_job_class_1 , + my_job_class_2 , + scheduled , + my_job_class_3 +}; ``` ### Simulation Object C++ properties