X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595e59c568ff5f8510de201bfd800951cdc2adcb..d8232f0af88b82c158f0451e3b41ef9ec85ced02:/src/instr/jedule/jedule.cpp diff --git a/src/instr/jedule/jedule.cpp b/src/instr/jedule/jedule.cpp index 86dbae5e65..ddbecb0ed5 100644 --- a/src/instr/jedule/jedule.cpp +++ b/src/instr/jedule/jedule.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2016. The SimGrid Team. +/* Copyright (c) 2010-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,38 +12,33 @@ namespace simgrid{ namespace jedule { -Jedule::~Jedule() { - delete this->root_container; - for (auto evt: this->event_set) - delete evt; - this->event_set.clear(); -} - -void Jedule::addMetaInfo(char *key, char *value) { +void Jedule::add_meta_info(char* key, char* value) +{ xbt_assert(key != nullptr); xbt_assert(value != nullptr); - this->meta_info.insert({key, value}); + this->meta_info_.insert({key, value}); } -void Jedule::writeOutput(FILE *file) { - if (!this->event_set.empty()){ +void Jedule::write_output(FILE* file) +{ + if (not this->event_set_.empty()) { fprintf(file, "\n"); - if (!this->meta_info.empty()){ + if (not this->meta_info_.empty()) { fprintf(file, " \n"); - for (auto elm: this->meta_info) + for (auto const& elm : this->meta_info_) fprintf(file, " \n",elm.first,elm.second); fprintf(file, " \n"); } fprintf(file, " \n"); - this->root_container->print(file); + this->root_container_.print(file); fprintf(file, " \n"); fprintf(file, " \n"); - for (auto event :this->event_set) - event->print(file); + for (auto const& event : this->event_set_) + event.print(file); fprintf(file, " \n"); fprintf(file, "\n");