X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..befbbbe1fbb31663a8f91e24ce12df271cf4ae79:/src/smpi/smpi_datatype.hpp diff --git a/src/smpi/smpi_datatype.hpp b/src/smpi/smpi_datatype.hpp index f2263b0ddd..51978b5c71 100644 --- a/src/smpi/smpi_datatype.hpp +++ b/src/smpi/smpi_datatype.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2009-2010, 2012-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -7,10 +6,8 @@ #ifndef SMPI_DATATYPE_HPP #define SMPI_DATATYPE_HPP -#include - -#include "private.h" - +#include "src/smpi/smpi_f2c.hpp" +#include "src/smpi/smpi_keyvals.hpp" #define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */ #define DT_FLAG_COMMITED 0x0002 /**< ready to be used for a send/recv operation */ @@ -114,9 +111,9 @@ class Datatype : public F2C, public Keyval{ void set_name(char* name); static int copy(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype); - virtual void serialize( void* noncontiguous, void *contiguous, + virtual void serialize( void* noncontiguous, void *contiguous, int count); - virtual void unserialize( void* contiguous, void *noncontiguous, + virtual void unserialize( void* contiguous, void *noncontiguous, int count, MPI_Op op); static int keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state); static int keyval_free(int* keyval);