X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cff982bd049d26d7acbd0e23324e0de051b06d0d..e53e94eb6cb9f8edda78234ec8a0ba7880431d2a:/src/instr/instr_paje_types.hpp diff --git a/src/instr/instr_paje_types.hpp b/src/instr/instr_paje_types.hpp index 9b69640ac7..a5e31d40c7 100644 --- a/src/instr/instr_paje_types.hpp +++ b/src/instr/instr_paje_types.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2021. 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. */ @@ -23,7 +23,7 @@ class Type { std::string name_; std::string color_; Type* father_; - std::map> children_; + std::map, std::less<>> children_; Container* issuer_ = nullptr; protected: @@ -41,7 +41,7 @@ public: const char* get_cname() const { return name_.c_str(); } const std::string& get_color() const { return color_; } Type* get_father() const { return father_; } - const std::map>& get_children() const { return children_; } + const std::map, std::less<>>& get_children() const { return children_; } bool is_colored() const { return not color_.empty(); } Type* by_name(const std::string& name); @@ -83,12 +83,11 @@ public: class ValueType : public Type { public: - std::map values_; + std::map> values_; ValueType(PajeEventType event_type, const std::string& name, const std::string& alias, Type* father) : Type(event_type, name, alias, "", father){}; ValueType(PajeEventType event_type, const std::string& name, Type* father) : Type(event_type, name, name, "", father){}; - ~ValueType() override = default; void add_entity_value(const std::string& name, const std::string& color); void add_entity_value(const std::string& name); EntityValue* get_entity_value(const std::string& name); @@ -102,8 +101,8 @@ public: { on_creation(*this, *source, *dest); } - void start_event(Container* startContainer, const std::string& value, const std::string& key); - void start_event(Container* startContainer, const std::string& value, const std::string& key, int size); + void start_event(Container* startContainer, const std::string& value, const std::string& key, + size_t size = static_cast(-1)); void end_event(Container* endContainer, const std::string& value, const std::string& key); };