X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd734700103914cbf09f9bb3db2aaf5a09ed768e..0eead244337fde8f0508629f8f8473f946c19f88:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index ee31b803f9..e672746f2d 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,10 +1,9 @@ -/* Copyright (c) 2008-2016. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2016. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -/** \file mc_compare.cpp Memory snapshooting and comparison */ +/** \file compare.cpp Memory snapshooting and comparison */ #include @@ -94,10 +93,10 @@ struct HeapLocation { static inline HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2) { - return simgrid::mc::HeapLocationPair({ + return simgrid::mc::HeapLocationPair{{ simgrid::mc::HeapLocation(block1, fragment1), simgrid::mc::HeapLocation(block2, fragment2) - }); + }}; } struct HeapArea : public HeapLocation { @@ -1016,7 +1015,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, int new_size1 = -1, new_size2 = -1; simgrid::mc::Type *new_type1 = nullptr, *new_type2 = nullptr; - int match_pairs = 0; + bool match_pairs = false; // This is the address of std_heap->heapinfo in the application process: void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; @@ -1031,7 +1030,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, simgrid::mc::HeapLocationPairs current; if (previous == nullptr) { previous = ¤t; - match_pairs = 1; + match_pairs = true; } // Get block number: