X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4929b7f325bed62b338613c63af15c75a185effe..3965b45784421b5cdf6069e048dad3e184ae7d72:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index f58bf9f074..a9c3598c65 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.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. */
@@ -14,7 +14,6 @@
 #include "src/instr/instr_paje_events.hpp"
 #include "src/instr/instr_paje_types.hpp"
 #include "src/instr/instr_paje_values.hpp"
-#include "xbt/graph.h"
 
 #include <fstream>
 #include <iomanip> /** std::setprecision **/
@@ -25,8 +24,6 @@
 #include <sstream>
 #include <string>
 
-typedef simgrid::instr::Container* container_t;
-
 namespace simgrid {
 namespace instr {
 namespace paje {
@@ -47,8 +44,6 @@ extern TraceFormat trace_format;
 extern int trace_precision;
 extern double last_timestamp_to_dump;
 
-long long int new_paje_id();
-
 void init();
 void define_callbacks();
 
@@ -89,11 +84,6 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
   // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness)
-  explicit TIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                  std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
-      : TIData(name, root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
-               std::shared_ptr<std::vector<int>>(recvcounts), send_type, recv_type){};
-
   explicit TIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
                   int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
                   const std::string& recv_type)
@@ -106,7 +96,7 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
 
-  virtual ~TIData() {}
+  virtual ~TIData() = default;
 
   const std::string& get_name() const { return name_; }
   double get_amount() const { return amount_; }
@@ -176,10 +166,6 @@ public:
 
 class VarCollTIData : public TIData {
 public:
-  explicit VarCollTIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                         std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
-      : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
-
   explicit VarCollTIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
                          int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
                          const std::string& recv_type)
@@ -251,11 +237,11 @@ public:
 
 XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
 
-extern XBT_PRIVATE std::set<std::string> created_categories;
-extern XBT_PRIVATE std::set<std::string> declared_marks;
-extern XBT_PRIVATE std::set<std::string> user_host_variables;
-extern XBT_PRIVATE std::set<std::string> user_vm_variables;
-extern XBT_PRIVATE std::set<std::string> user_link_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> created_categories;
+extern XBT_PRIVATE std::set<std::string, std::less<>> declared_marks;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_host_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_vm_variables;
+extern XBT_PRIVATE std::set<std::string, std::less<>> user_link_variables;
 
 /* from instr_config.c */
 XBT_PRIVATE bool TRACE_needs_platform();