From f4346e481ab9b9cf0f8c0791cd40c62d6d0c8486 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 24 Nov 2020 09:34:18 +0100 Subject: [PATCH] Fix ctors for smpi::Datatype. const char* / unused declaration / cosmetic parameter rename --- src/smpi/include/smpi_datatype.hpp | 5 ++--- src/smpi/mpi/smpi_datatype.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp index dace552ca0..3d400d0745 100644 --- a/src/smpi/include/smpi_datatype.hpp +++ b/src/smpi/include/smpi_datatype.hpp @@ -106,10 +106,9 @@ public: static int keyval_id_; Datatype_contents* contents_ = nullptr; - Datatype(int id, int size, MPI_Aint lb, MPI_Aint ub, int flags); - Datatype(char* name, int id, int size, MPI_Aint lb, MPI_Aint ub, int flags); + Datatype(int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags); + Datatype(const char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags); Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags); - Datatype(char* name, int size, MPI_Aint lb, MPI_Aint ub, int flags); Datatype(Datatype* datatype, int* ret); Datatype(const Datatype&) = delete; Datatype& operator=(const Datatype&) = delete; diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp index 85d16a6c3e..09e34bef6b 100644 --- a/src/smpi/mpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -120,7 +120,7 @@ Datatype::Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags) : size_(size), } // for predefined types, so refcount_ = 0. -Datatype::Datatype(char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags) +Datatype::Datatype(const char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags) : name_(name), id(std::to_string(ident)), size_(size), lb_(lb), ub_(ub), flags_(flags), refcount_(0) { id2type_lookup.insert({id, this}); -- 2.20.1