fix issues with attr and cloning

[simgrid.git] / src / smpi / include / smpi_datatype_derived.hpp

diff --git a/src/smpi/include/smpi_datatype_derived.hpp b/src/smpi/include/smpi_datatype_derived.hpp
index 890b4eb..707b47c 100644 (file)
--- a/src/smpi/include/smpi_datatype_derived.hpp
+++ b/src/smpi/include/smpi_datatype_derived.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2019. The SimGrid Team.
+/* Copyright (c) 2009-2020. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -21,11 +21,13 @@ public:
   Type_Contiguous(const Type_Contiguous&) = delete;
   Type_Contiguous& operator=(const Type_Contiguous&) = delete;
   ~Type_Contiguous();
-  void serialize(const void* noncontiguous, void* contiguous, int count);
-  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op);
+  int clone(MPI_Datatype* type) override;
+  void serialize(const void* noncontiguous, void* contiguous, int count) override;
+  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op) override;
 };
 
 class Type_Hvector: public Datatype{
+public:
   int block_count_;
   int block_length_;
   MPI_Aint block_stride_;
@@ -37,17 +39,20 @@ public:
   Type_Hvector(const Type_Hvector&) = delete;
   Type_Hvector& operator=(const Type_Hvector&) = delete;
   ~Type_Hvector();
-  void serialize(const void* noncontiguous, void* contiguous, int count);
-  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op);
+  int clone(MPI_Datatype* type) override;
+  void serialize(const void* noncontiguous, void* contiguous, int count) override;
+  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op) override;
 };
 
 class Type_Vector : public Type_Hvector {
 public:
   Type_Vector(int size, MPI_Aint lb, MPI_Aint ub, int flags, int count, int blocklen, int stride,
               MPI_Datatype old_type);
+  int clone(MPI_Datatype* type) override;
 };
 
 class Type_Hindexed: public Datatype{
+public:
   int block_count_;
   int* block_lengths_;
   MPI_Aint* block_indices_;
@@ -60,15 +65,17 @@ public:
                 MPI_Datatype old_type, MPI_Aint factor);
   Type_Hindexed(const Type_Hindexed&) = delete;
   Type_Hindexed& operator=(const Type_Hindexed&) = delete;
+  int clone(MPI_Datatype* type) override;
   ~Type_Hindexed();
-  void serialize(const void* noncontiguous, void* contiguous, int count);
-  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op);
+  void serialize(const void* noncontiguous, void* contiguous, int count) override;
+  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op) override;
 };
 
 class Type_Indexed : public Type_Hindexed {
 public:
   Type_Indexed(int size, MPI_Aint lb, MPI_Aint ub, int flags, int block_count, const int* block_lengths, const int* block_indices,
                MPI_Datatype old_type);
+  int clone(MPI_Datatype* type) override;
 };
 
 class Type_Struct: public Datatype{
@@ -82,9 +89,10 @@ public:
               const MPI_Aint* block_indices, const MPI_Datatype* old_types);
   Type_Struct(const Type_Struct&) = delete;
   Type_Struct& operator=(const Type_Struct&) = delete;
+  int clone(MPI_Datatype* type) override;
   ~Type_Struct();
-  void serialize(const void* noncontiguous, void* contiguous, int count);
-  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op);
+  void serialize(const void* noncontiguous, void* contiguous, int count) override;
+  void unserialize(const void* contiguous_vector, void* noncontiguous_vector, int count, MPI_Op op) override;
 };
 
 } // namespace smpi