X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2ad536e710c5936ff8e525e4bbb5e7046f292aac..40ee10e13b61bfb28374d96ade010a262b5abd44:/include/simgrid/Exception.hpp diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp index f4d151f83e..4b14e56cfe 100644 --- a/include/simgrid/Exception.hpp +++ b/include/simgrid/Exception.hpp @@ -3,11 +3,12 @@ /* 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. */ -/* This file defines all possible exception that could occur in a SimGrid library. */ +/* This file defines all possible exceptions that could occur in a SimGrid library. */ #ifndef SIMGRID_EXCEPTIONS_HPP #define SIMGRID_EXCEPTIONS_HPP +#include #include #include #include @@ -31,7 +32,7 @@ class ThrowPoint { public: ThrowPoint() = default; explicit ThrowPoint(const char* file, int line, const char* function, Backtrace&& bt, std::string&& actor_name, - int pid) + aid_t pid) : file_(file) , line_(line) , function_(function) @@ -46,7 +47,7 @@ public: const char* function_ = nullptr; Backtrace backtrace_; std::string procname_ = ""; /**< Name of the process who thrown this */ - int pid_ = 0; /**< PID of the process who thrown this */ + aid_t pid_ = 0; /**< PID of the process who thrown this */ }; /** Create a ThrowPoint with (__FILE__, __LINE__, __func__) */ @@ -184,7 +185,8 @@ public: const char* what() const noexcept { return msg_.c_str(); } XBT_ATTRIB_NORETURN static void do_throw(); - static bool try_n_catch(const std::function& try_block); + XBT_ATTRIB_DEPRECATED_v338("Please manifest if you actually need this function") static bool try_n_catch( + const std::function& try_block); private: std::string msg_ = "Actor killed.";