Fix Windows warning and Vera style complaint

DynamoRIO · Mar 26, 2024 · 6aad1dc · 6aad1dc
1 parent b6c1a28
commit 6aad1dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/clients/drcachesim/scheduler/scheduler.cpp b/clients/drcachesim/scheduler/scheduler.cpp
@@ -1149,7 +1149,7 @@ scheduler_tmpl_t<RecordType, ReaderType>::read_traced_schedule()
     // disk2index would then hold 1,2,0,3, but we want 2,0,1,3.
     std::vector<output_ordinal_t> disk2output(disk2index.size());
     for (size_t i = 0; i < disk2index.size(); ++i) {
-        disk2output[disk2index[i]] = i;
+        disk2output[disk2index[i]] = static_cast<output_ordinal_t>(i);
     }
     for (int disk_idx = 0; disk_idx < static_cast<output_ordinal_t>(outputs_.size());
          ++disk_idx) {

diff --git a/clients/drcachesim/tests/scheduler_unit_tests.cpp b/clients/drcachesim/tests/scheduler_unit_tests.cpp
@@ -3487,9 +3487,10 @@ test_replay_as_traced_sort()
         if (status == scheduler_t::STATUS_OK) {
             assert(memref.marker.tid == TID_BASE + INDICES[i]);
             if (memref.marker.type == TRACE_TYPE_MARKER &&
-                memref.marker.marker_type == TRACE_MARKER_TYPE_CPU_ID)
+                memref.marker.marker_type == TRACE_MARKER_TYPE_CPU_ID) {
                 assert(static_cast<int>(memref.marker.marker_value) ==
                        CPUIDS[INDICES[i]]);
+            }
         } else
             assert(status == scheduler_t::STATUS_EOF);
     }