From ca5f95778d7446d7e1d96ecf878f756c3c24270f Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Tue, 6 Apr 2021 20:34:27 +0200 Subject: [PATCH] appease clang --- src/smpi/include/smpi_comm.hpp | 2 +- src/smpi/include/smpi_datatype.hpp | 2 +- src/smpi/include/smpi_errhandler.hpp | 2 +- src/smpi/include/smpi_file.hpp | 2 +- src/smpi/include/smpi_group.hpp | 2 +- src/smpi/include/smpi_info.hpp | 2 +- src/smpi/include/smpi_op.hpp | 2 +- src/smpi/include/smpi_win.hpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp index 0ca688da18..f54a743c8b 100644 --- a/src/smpi/include/smpi_comm.hpp +++ b/src/smpi/include/smpi_comm.hpp @@ -54,7 +54,7 @@ public: int rank() const; int id() const; void get_name(char* name, int* len) const; - std::string name() const; + std::string name() const override; void set_name(const char* name); MPI_Info info(); void set_info( MPI_Info info); diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp index 19ad3abd14..8b7f9475d9 100644 --- a/src/smpi/include/smpi_datatype.hpp +++ b/src/smpi/include/smpi_datatype.hpp @@ -127,7 +127,7 @@ public: Datatype(const Datatype&) = delete; Datatype& operator=(const Datatype&) = delete; ~Datatype() override; - std::string name() const {return name_.empty() ? std::string("MPI_Datatype") : name_;} + std::string name() const override {return name_.empty() ? std::string("MPI_Datatype") : name_;} size_t size() const { return size_; } MPI_Aint lb() const { return lb_; } MPI_Aint ub() const { return ub_; } diff --git a/src/smpi/include/smpi_errhandler.hpp b/src/smpi/include/smpi_errhandler.hpp index fb8565945c..7ae65f19c2 100644 --- a/src/smpi/include/smpi_errhandler.hpp +++ b/src/smpi/include/smpi_errhandler.hpp @@ -25,7 +25,7 @@ class Errhandler: public F2C { explicit Errhandler(MPI_File_errhandler_fn *function):file_func_(function){}; explicit Errhandler(MPI_Win_errhandler_fn *function):win_func_(function){}; void ref(); - std::string name() const {return "MPI_Errhandler";} + std::string name() const override {return "MPI_Errhandler";} void call(MPI_Comm comm, int errorcode) const; void call(MPI_Win win, int errorcode) const; void call(MPI_File file, int errorcode) const; diff --git a/src/smpi/include/smpi_file.hpp b/src/smpi/include/smpi_file.hpp index dfd995c760..10eaf26c08 100644 --- a/src/smpi/include/smpi_file.hpp +++ b/src/smpi/include/smpi_file.hpp @@ -42,7 +42,7 @@ class File : public F2C{ int get_position_shared(MPI_Offset* offset) const; int flags() const; MPI_Comm comm() const; - std::string name() const {return file_ ? std::string("MPI_File: ")+ std::string(file_->get_path()): std::string("MPI_File");} + std::string name() const override {return file_ ? std::string("MPI_File: ")+ std::string(file_->get_path()): std::string("MPI_File");} int sync(); int seek(MPI_Offset offset, int whence); diff --git a/src/smpi/include/smpi_group.hpp b/src/smpi/include/smpi_group.hpp index c3ef76107e..4b8feeac11 100644 --- a/src/smpi/include/smpi_group.hpp +++ b/src/smpi/include/smpi_group.hpp @@ -34,7 +34,7 @@ public: void set_mapping(s4u::Actor* actor, int rank); int rank(int index); s4u::Actor* actor(int rank); - std::string name() const {return std::string("MPI_Group");} + std::string name() const override {return std::string("MPI_Group");} int rank(s4u::Actor* process); void ref(); static void unref(MPI_Group group); diff --git a/src/smpi/include/smpi_info.hpp b/src/smpi/include/smpi_info.hpp index 4650a83f51..d655edcfd0 100644 --- a/src/smpi/include/smpi_info.hpp +++ b/src/smpi/include/smpi_info.hpp @@ -26,7 +26,7 @@ public: static void unref(MPI_Info info); void set(const char* key, const char* value) { map_[key] = value; } int get(const char* key, int valuelen, char* value, int* flag) const; - std::string name() const {return std::string("MPI_Info");} + std::string name() const override {return std::string("MPI_Info");} int remove(const char* key); int get_nkeys(int* nkeys) const; int get_nthkey(int n, char* key) const; diff --git a/src/smpi/include/smpi_op.hpp b/src/smpi/include/smpi_op.hpp index 58980e8d25..9150412b2c 100644 --- a/src/smpi/include/smpi_op.hpp +++ b/src/smpi/include/smpi_op.hpp @@ -26,7 +26,7 @@ public: bool is_predefined() const { return is_predefined_; } bool is_fortran_op() const { return is_fortran_op_; } int allowed_types() const { return types_; } - std::string name() const {return std::string("MPI_Op");} + std::string name() const override {return std::string("MPI_Op");} // tell that we were created from fortran, so we need to translate the type to fortran when called void set_fortran_op() { is_fortran_op_ = true; } void apply(const void* invec, void* inoutvec, const int* len, MPI_Datatype datatype) const; diff --git a/src/smpi/include/smpi_win.hpp b/src/smpi/include/smpi_win.hpp index 090e89838e..b20bfa9a08 100644 --- a/src/smpi/include/smpi_win.hpp +++ b/src/smpi/include/smpi_win.hpp @@ -54,7 +54,7 @@ public: int attach (void *base, MPI_Aint size); int detach (const void *base); void get_name(char* name, int* length) const; - std::string name() const {return name_.empty() ? std::string("MPI_Win") : name_;} + std::string name() const override {return name_.empty() ? std::string("MPI_Win") : name_;} void get_group( MPI_Group* group); void set_name(const char* name); int rank() const; -- 2.20.1