Merge branch 'clean_events' of github.com:Takishipp/simgrid into clean_events

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

diff --git a/src/smpi/smpi_datatype_derived.hpp b/src/smpi/smpi_datatype_derived.hpp
index 12e1829..4ed9f73 100644 (file)
--- a/src/smpi/smpi_datatype_derived.hpp
+++ b/src/smpi/smpi_datatype_derived.hpp
@@ -7,23 +7,21 @@
 #ifndef SMPI_DATATYPE_DERIVED_HPP
 #define SMPI_DATATYPE_DERIVED_HPP
 
-#include <xbt/base.h>
-
-#include "private.h"
+#include "src/smpi/smpi_datatype.hpp"
 
 namespace simgrid{
 namespace smpi{
 
-class Type_Contiguous: public Datatype{
+class Type_Contiguous: public Datatype {
   private:
     int block_count_;
     MPI_Datatype old_type_;
   public:
     Type_Contiguous(int size, MPI_Aint lb, MPI_Aint ub, int flags, int block_count, MPI_Datatype old_type);
     ~Type_Contiguous();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };
 
@@ -36,9 +34,9 @@ class Type_Vector: public Datatype{
   public:
     Type_Vector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int count, int blocklen, int stride, MPI_Datatype old_type);
     ~Type_Vector();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };
 
@@ -51,9 +49,9 @@ class Type_Hvector: public Datatype{
   public:
     Type_Hvector(int size,MPI_Aint lb, MPI_Aint ub, int flags, int block_count, int block_length, MPI_Aint block_stride, MPI_Datatype old_type);
     ~Type_Hvector();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };
 
@@ -66,9 +64,9 @@ class Type_Indexed: public Datatype{
   public:
     Type_Indexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int block_count, int* block_lengths, int* block_indices, MPI_Datatype old_type);
     ~Type_Indexed();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };
 
@@ -81,9 +79,9 @@ class Type_Hindexed: public Datatype{
   public:
     Type_Hindexed(int size,MPI_Aint lb, MPI_Aint ub, int flags, int block_count, int* block_lengths, MPI_Aint* block_indices, MPI_Datatype old_type);
     ~Type_Hindexed();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };
 
@@ -96,9 +94,9 @@ class Type_Struct: public Datatype{
   public:
     Type_Struct(int size,MPI_Aint lb, MPI_Aint ub, int flags, int block_count, int* block_lengths, MPI_Aint* block_indices, MPI_Datatype* old_types);
     ~Type_Struct();
-    void serialize( void* noncontiguous, void *contiguous, 
+    void serialize( void* noncontiguous, void *contiguous,
                             int count);
-    void unserialize( void* contiguous_vector, void *noncontiguous_vector, 
+    void unserialize( void* contiguous_vector, void *noncontiguous_vector,
                               int count, MPI_Op op);
 };