Commit badaf513 authored by Moritz Hanke's avatar Moritz Hanke
Browse files

removes "typedef struct Xt_idxlist *xt_idxlist;"

parent a206c9cb
......@@ -42,13 +42,13 @@ int main(void) {
MPI_Barrier (MPI_COMM_WORLD);
// source index list by stripes
xt_idxlist src_idxlist;
Xt_idxlist src_idxlist;
struct Xt_stripe src_stripes = {rank*leng, leng, 1};
src_idxlist = xt_idxstripes_new(&src_stripes, 1);
// destination index list by stripes
xt_idxlist dst_idxlist;
Xt_idxlist dst_idxlist;
struct Xt_stripe dst_stripes = {((rank+1)*leng)%(size*leng), leng, 1};
dst_idxlist = xt_idxstripes_new(&dst_stripes, 1);
......
......@@ -29,7 +29,7 @@ void xt_idxlist_pack(Xt_idxlist idxlist, void *buffer,
position, comm);
}
xt_idxlist xt_idxlist_unpack(void *buffer, int buffer_size,
Xt_idxlist xt_idxlist_unpack(void *buffer, int buffer_size,
int *position, MPI_Comm comm) {
int type;
......@@ -57,10 +57,10 @@ xt_idxlist xt_idxlist_unpack(void *buffer, int buffer_size,
return NULL;
}
xt_idxlist xt_idxlist_get_intersection(xt_idxlist idxlist_src,
xt_idxlist idxlist_dst) {
Xt_idxlist xt_idxlist_get_intersection(Xt_idxlist idxlist_src,
Xt_idxlist idxlist_dst) {
xt_idxlist intersection;
Xt_idxlist intersection;
intersection = idxlist_src->vtable->get_intersection(idxlist_src, idxlist_dst);
......@@ -79,7 +79,7 @@ xt_idxlist xt_idxlist_get_intersection(xt_idxlist idxlist_src,
xt_idxlist_get_indices(idxlist_src, indices_src);
xt_idxlist_get_indices(idxlist_dst, indices_dst);
xt_idxlist idxvec_src, idxvec_dst;
Xt_idxlist idxvec_src, idxvec_dst;
idxvec_src = xt_idxvec_new(indices_src, num_indices_src);
idxvec_dst = xt_idxvec_new(indices_dst, num_indices_dst);
......@@ -96,22 +96,22 @@ xt_idxlist xt_idxlist_get_intersection(xt_idxlist idxlist_src,
return intersection;
}
xt_idxlist xt_idxlist_copy(xt_idxlist idxlist) {
Xt_idxlist xt_idxlist_copy(Xt_idxlist idxlist) {
return idxlist->vtable->copy(idxlist);
}
Xt_count xt_idxlist_get_num_indices(xt_idxlist idxlist) {
Xt_count xt_idxlist_get_num_indices(Xt_idxlist idxlist) {
return idxlist->vtable->get_num_indices(idxlist);
}
void xt_idxlist_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
void xt_idxlist_get_indices(Xt_idxlist idxlist, Xt_idx *indices) {
idxlist->vtable->get_indices(idxlist, indices);
}
void xt_idxlist_get_index_stripes(xt_idxlist idxlist,
void xt_idxlist_get_index_stripes(Xt_idxlist idxlist,
struct Xt_stripe ** stripes,
Xt_count * num_stripes) {
......@@ -163,7 +163,7 @@ int xt_idxlist_get_position_of_indices(Xt_idxlist idxlist, Xt_idx * indices,
Xt_idx *tmp_indices;
tmp_indices = xmalloc(num_tmp_indices * sizeof (tmp_indices[0]));
xt_idxlist_get_indices(idxlist, tmp_indices);
xt_idxlist tmp_idxvec;
Xt_idxlist tmp_idxvec;
tmp_idxvec = xt_idxvec_new(tmp_indices, num_tmp_indices);
int retval = tmp_idxvec->vtable->get_position_of_indices(tmp_idxvec, indices, num_indices,
positions, single_match_only);
......
......@@ -12,15 +12,15 @@ struct Xt_stripe {
struct xt_idxlist_vtable {
void (*delete)(xt_idxlist);
void (*delete)(Xt_idxlist);
size_t (*get_pack_size)(xt_idxlist, MPI_Comm);
void (*pack)(xt_idxlist, void*, int, int*, MPI_Comm);
xt_idxlist (*get_intersection)(xt_idxlist,xt_idxlist);
xt_idxlist (*copy)(xt_idxlist);
Xt_count (*get_num_indices)(xt_idxlist);
void (*get_indices)(xt_idxlist, Xt_idx *indices);
void (*get_index_stripes)(xt_idxlist, struct Xt_stripe **, Xt_count *);
size_t (*get_pack_size)(Xt_idxlist, MPI_Comm);
void (*pack)(Xt_idxlist, void*, int, int*, MPI_Comm);
Xt_idxlist (*get_intersection)(Xt_idxlist,Xt_idxlist);
Xt_idxlist (*copy)(Xt_idxlist);
Xt_count (*get_num_indices)(Xt_idxlist);
void (*get_indices)(Xt_idxlist, Xt_idx *indices);
void (*get_index_stripes)(Xt_idxlist, struct Xt_stripe **, Xt_count *);
int (*get_index)(Xt_idxlist, int, Xt_idx *);
int (*get_position_of_index)(Xt_idxlist, Xt_idx, int *);
int (*get_position_of_indices)(Xt_idxlist, Xt_idx *, Xt_count, int *, int);
......@@ -38,13 +38,13 @@ enum xt_idxvecype {
STRIPES = 4,
};
struct xt_idxlist {
struct Xt_idxlist {
struct xt_idxlist_vtable *vtable;
};
struct xt_idxlist_unpack_routine_table {
enum xt_idxvecype type;
xt_idxlist (*xt_idxlist_unpack)(void*,int,int*,MPI_Comm);
Xt_idxlist (*xt_idxlist_unpack)(void*,int,int*,MPI_Comm);
};
/**
......@@ -69,7 +69,7 @@ struct xt_idxlist_unpack_routine_table {
* @see xt_idxlist_pack
* @see xt_idxlist_unpack
*/
size_t xt_idxlist_get_pack_size(xt_idxlist idxlist, MPI_Comm comm);
size_t xt_idxlist_get_pack_size(Xt_idxlist idxlist, MPI_Comm comm);
/**
* packs an index list into previously allocated buffer using MPI_Pack
......@@ -93,7 +93,7 @@ size_t xt_idxlist_get_pack_size(xt_idxlist idxlist, MPI_Comm comm);
* @see xt_idxlist_unpack
*
*/
void xt_idxlist_pack(xt_idxlist idxlist, void* buffer, int buffer_size,
void xt_idxlist_pack(Xt_idxlist idxlist, void* buffer, int buffer_size,
int* position, MPI_Comm comm);
/**
......@@ -111,7 +111,7 @@ void xt_idxlist_pack(xt_idxlist idxlist, void* buffer, int buffer_size,
*
* @see xt_idxlist_pack
*/
xt_idxlist xt_idxlist_unpack(void* buffer, int buffer_size,
Xt_idxlist xt_idxlist_unpack(void* buffer, int buffer_size,
int* position, MPI_Comm comm);
/**
......@@ -124,8 +124,8 @@ xt_idxlist xt_idxlist_unpack(void* buffer, int buffer_size,
* duplicate elements in the intersection if idxlist_src contains i
* @remark the elements in the resulting index list are sorted
*/
xt_idxlist
xt_idxlist_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst);
Xt_idxlist
xt_idxlist_get_intersection(Xt_idxlist idxlist_src, Xt_idxlist idxlist_dst);
/**
* generates a copy of a given index list
......@@ -133,7 +133,7 @@ xt_idxlist_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst);
* @param[in] idxlist index list that is to be copied
* @return returns a copy of the given index list
*/
xt_idxlist xt_idxlist_copy(xt_idxlist idxlist);
Xt_idxlist xt_idxlist_copy(Xt_idxlist idxlist);
/**
* returns the number of indices stored in the given index list
......@@ -141,7 +141,7 @@ xt_idxlist xt_idxlist_copy(xt_idxlist idxlist);
* @param[in] idxlist index list for which the number of indices is required
* @return number of indices in the given index list
*/
Xt_count xt_idxlist_get_num_indices(xt_idxlist idxlist);
Xt_count xt_idxlist_get_num_indices(Xt_idxlist idxlist);
/**
* gets the indices stored in an index list
......@@ -149,7 +149,7 @@ Xt_count xt_idxlist_get_num_indices(xt_idxlist idxlist);
* @param[in] idxlist index list for which the indices are to be returned
* @param[in,out] indices array into which the indices are written
*/
void xt_idxlist_get_indices(xt_idxlist idxlist, Xt_idx *indices);
void xt_idxlist_get_indices(Xt_idxlist idxlist, Xt_idx *indices);
/**
* returns the indices stored in an index list
......@@ -160,7 +160,7 @@ void xt_idxlist_get_indices(xt_idxlist idxlist, Xt_idx *indices);
* for freeing the memory associated with the stripes)
* @param[out] num_stripes number of stripes in array "stripes"
*/
void xt_idxlist_get_index_stripes(xt_idxlist idxlist,
void xt_idxlist_get_index_stripes(Xt_idxlist idxlist,
struct Xt_stripe ** stripes,
Xt_count * num_stripes);
......
......@@ -13,30 +13,30 @@
#include "ensure_array_size.h"
static void
idxlist_collection_delete(xt_idxlist data);
idxlist_collection_delete(Xt_idxlist data);
static size_t
idxlist_collection_get_pack_size(xt_idxlist data, MPI_Comm comm);
idxlist_collection_get_pack_size(Xt_idxlist data, MPI_Comm comm);
static void
idxlist_collection_pack(xt_idxlist data, void *buffer, int buffer_size,
idxlist_collection_pack(Xt_idxlist data, void *buffer, int buffer_size,
int *position, MPI_Comm comm);
static xt_idxlist
idxlist_collection_get_intersection(xt_idxlist idxlist_src,
xt_idxlist idxlist_dst);
static Xt_idxlist
idxlist_collection_get_intersection(Xt_idxlist idxlist_src,
Xt_idxlist idxlist_dst);
static xt_idxlist
idxlist_collection_copy(xt_idxlist idxlist);
static Xt_idxlist
idxlist_collection_copy(Xt_idxlist idxlist);
static Xt_count
idxlist_collection_get_num_indices(xt_idxlist idxlist);
idxlist_collection_get_num_indices(Xt_idxlist idxlist);
static void
idxlist_collection_get_indices(xt_idxlist idxlist, Xt_idx *indices);
idxlist_collection_get_indices(Xt_idxlist idxlist, Xt_idx *indices);
static void
idxlist_collection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxlist_collection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes);
static int
......@@ -68,11 +68,11 @@ struct xt_idxlist_collection {
const struct xt_idxlist_vtable *vtable;
xt_idxlist * idxlists;
Xt_idxlist * idxlists;
unsigned num_idxlists;
};
xt_idxlist xt_idxlist_collection_new(xt_idxlist *idxlists, unsigned num_idxlists) {
Xt_idxlist xt_idxlist_collection_new(Xt_idxlist *idxlists, unsigned num_idxlists) {
struct xt_idxlist_collection *collectionlist;
......@@ -87,10 +87,10 @@ xt_idxlist xt_idxlist_collection_new(xt_idxlist *idxlists, unsigned num_idxlists
for (i = 0; i < num_idxlists; ++i)
collectionlist->idxlists[i] = xt_idxlist_copy(idxlists[i]);
return (xt_idxlist)collectionlist;
return (Xt_idxlist)collectionlist;
}
void idxlist_collection_delete(xt_idxlist data) {
void idxlist_collection_delete(Xt_idxlist data) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)data;
......@@ -103,7 +103,7 @@ void idxlist_collection_delete(xt_idxlist data) {
free(collectionlist);
}
size_t idxlist_collection_get_pack_size(xt_idxlist data, MPI_Comm comm) {
size_t idxlist_collection_get_pack_size(Xt_idxlist data, MPI_Comm comm) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)data;
......@@ -120,7 +120,7 @@ size_t idxlist_collection_get_pack_size(xt_idxlist data, MPI_Comm comm) {
return size_int + size_unsigned + size_idxlists;
}
void idxlist_collection_pack(xt_idxlist data, void *buffer, int buffer_size, int *position,
void idxlist_collection_pack(Xt_idxlist data, void *buffer, int buffer_size, int *position,
MPI_Comm comm) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)data;
......@@ -137,7 +137,7 @@ void idxlist_collection_pack(xt_idxlist data, void *buffer, int buffer_size, int
xt_idxlist_pack(collectionlist->idxlists[i], buffer, buffer_size, position, comm);
}
xt_idxlist xt_idxlist_collection_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxlist_collection_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm) {
struct xt_idxlist_collection *collectionlist;
......@@ -159,16 +159,16 @@ xt_idxlist xt_idxlist_collection_unpack(void *buffer, int buffer_size, int *posi
collectionlist->idxlists[i] = xt_idxlist_unpack(buffer, buffer_size,
position, comm);
return (xt_idxlist)collectionlist;
return (Xt_idxlist)collectionlist;
}
xt_idxlist idxlist_collection_get_intersection(xt_idxlist idxlist_src,
xt_idxlist idxlist_dst) {
Xt_idxlist idxlist_collection_get_intersection(Xt_idxlist idxlist_src,
Xt_idxlist idxlist_dst) {
return NULL;
}
xt_idxlist idxlist_collection_copy(xt_idxlist idxlist) {
Xt_idxlist idxlist_collection_copy(Xt_idxlist idxlist) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)idxlist;
......@@ -176,7 +176,7 @@ xt_idxlist idxlist_collection_copy(xt_idxlist idxlist) {
}
static Xt_count
idxlist_collection_get_num_indices(xt_idxlist idxlist) {
idxlist_collection_get_num_indices(Xt_idxlist idxlist) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)idxlist;
......@@ -190,7 +190,7 @@ idxlist_collection_get_num_indices(xt_idxlist idxlist) {
}
static void
idxlist_collection_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
idxlist_collection_get_indices(Xt_idxlist idxlist, Xt_idx *indices) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)idxlist;
......@@ -205,7 +205,7 @@ idxlist_collection_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
}
static void
idxlist_collection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxlist_collection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes) {
struct xt_idxlist_collection *collectionlist = (struct xt_idxlist_collection*)idxlist;
......
......@@ -11,11 +11,11 @@
*
* @param[in] idxlists array containing a number of index lists
* @param[in] num_idxlists number of index lists in idxlists
* @return returns a xt_idxlist
* @return returns a Xt_idxlist$
*/
xt_idxlist xt_idxlist_collection_new(xt_idxlist *idxlists, unsigned num_idxlists);
Xt_idxlist xt_idxlist_collection_new(Xt_idxlist *idxlists, unsigned num_idxlists);
xt_idxlist xt_idxlist_collection_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxlist_collection_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm);
#endif // XT_IDXLIST_COLLECTION_H
......@@ -9,29 +9,29 @@
#include "core/ppm_xfuncs.h"
static void
idxsection_delete(xt_idxlist data);
idxsection_delete(Xt_idxlist data);
static size_t
idxsection_get_pack_size(xt_idxlist data, MPI_Comm comm);
idxsection_get_pack_size(Xt_idxlist data, MPI_Comm comm);
static void
idxsection_pack(xt_idxlist data, void *buffer, int buffer_size,
idxsection_pack(Xt_idxlist data, void *buffer, int buffer_size,
int *position, MPI_Comm comm);
static xt_idxlist
idxsection_get_intersection(xt_idxlist idxlist_a, xt_idxlist idxlist_b);
static Xt_idxlist
idxsection_get_intersection(Xt_idxlist idxlist_a, Xt_idxlist idxlist_b);
static xt_idxlist
idxsection_copy(xt_idxlist idxlist);
static Xt_idxlist
idxsection_copy(Xt_idxlist idxlist);
static Xt_count
idxsection_get_num_indices(xt_idxlist idxlist);
idxsection_get_num_indices(Xt_idxlist idxlist);
static void
idxsection_get_indices(xt_idxlist idxlist, Xt_idx *indices);
idxsection_get_indices(Xt_idxlist idxlist, Xt_idx *indices);
static void
idxsection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxsection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes);
static int
......@@ -123,7 +123,7 @@ Xt_idxlist xt_idxsection_new(Xt_idx start, unsigned num_dimensions,
}
static void
idxsection_delete(xt_idxlist data) {
idxsection_delete(Xt_idxlist data) {
struct xt_idxsection *section;
......@@ -140,7 +140,7 @@ idxsection_delete(xt_idxlist data) {
}
static size_t
idxsection_get_pack_size(xt_idxlist data, MPI_Comm comm) {
idxsection_get_pack_size(Xt_idxlist data, MPI_Comm comm) {
struct xt_idxsection *section = (struct xt_idxsection*)data;
......@@ -155,7 +155,7 @@ idxsection_get_pack_size(xt_idxlist data, MPI_Comm comm) {
}
static void
idxsection_pack(xt_idxlist data, void *buffer, int buffer_size,
idxsection_pack(Xt_idxlist data, void *buffer, int buffer_size,
int *position, MPI_Comm comm) {
assert(data);
......@@ -184,7 +184,7 @@ idxsection_pack(xt_idxlist data, void *buffer, int buffer_size,
buffer_size, position, comm), comm);
}
xt_idxlist xt_idxsection_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxsection_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm) {
struct xt_idxsection *section;
......@@ -226,11 +226,11 @@ xt_idxlist xt_idxsection_unpack(void *buffer, int buffer_size, int *position,
section->local_strides, section->ndim,
MPI_UNSIGNED, comm),comm);
return (xt_idxlist)section;
return (Xt_idxlist)section;
}
static Xt_idxlist
idxsection_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst) {
idxsection_get_intersection(Xt_idxlist idxlist_src, Xt_idxlist idxlist_dst) {
if (idxlist_dst->vtable != &idxsection_vtable) return NULL;
......@@ -279,7 +279,7 @@ idxsection_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst) {
local_size[i] = local_end - local_start[i];
}
struct xt_idxlist *intersection;
struct Xt_idxlist *intersection;
intersection = xt_idxsection_new(idxsection_src->global_start_index,
idxsection_src->ndim,
......@@ -292,8 +292,8 @@ idxsection_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst) {
return intersection;
}
static xt_idxlist
idxsection_copy(xt_idxlist idxlist) {
static Xt_idxlist
idxsection_copy(Xt_idxlist idxlist) {
struct xt_idxsection *section;
......@@ -305,7 +305,7 @@ idxsection_copy(xt_idxlist idxlist) {
}
static Xt_count
idxsection_get_num_indices(xt_idxlist idxlist) {
idxsection_get_num_indices(Xt_idxlist idxlist) {
struct xt_idxsection * section;
......@@ -321,7 +321,7 @@ idxsection_get_num_indices(xt_idxlist idxlist) {
}
static void
idxsection_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
idxsection_get_indices(Xt_idxlist idxlist, Xt_idx *indices) {
struct xt_idxsection *section;
......@@ -355,7 +355,7 @@ idxsection_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
}
static void
idxsection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxsection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes) {
struct xt_idxsection *section;
......
......@@ -22,7 +22,7 @@ Xt_idxlist xt_idxsection_new(Xt_idx start, unsigned num_dimensions,
unsigned * global_size, unsigned * local_size,
unsigned * local_start);
xt_idxlist xt_idxsection_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxsection_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm);
#endif // XT_IDXSECTION_H
......@@ -14,29 +14,29 @@
#define MAX(a,b) (((a)>(b))?(a):(b))
static void
idxstripes_delete(xt_idxlist data);
idxstripes_delete(Xt_idxlist data);
static size_t
idxstripes_get_pack_size(xt_idxlist data, MPI_Comm comm);
idxstripes_get_pack_size(Xt_idxlist data, MPI_Comm comm);
static void
idxstripes_pack(xt_idxlist data, void *buffer, int buffer_size,
idxstripes_pack(Xt_idxlist data, void *buffer, int buffer_size,
int *position, MPI_Comm comm);
static xt_idxlist
idxstripes_get_intersection(xt_idxlist idxlist_a, xt_idxlist idxlist_b);
static Xt_idxlist
idxstripes_get_intersection(Xt_idxlist idxlist_a, Xt_idxlist idxlist_b);
static xt_idxlist
idxstripes_copy(xt_idxlist idxlist);
static Xt_idxlist
idxstripes_copy(Xt_idxlist idxlist);
static Xt_count
idxstripes_get_num_indices(xt_idxlist idxlist);
idxstripes_get_num_indices(Xt_idxlist idxlist);
static void
idxstripes_get_indices(xt_idxlist idxlist, Xt_idx *indices);
idxstripes_get_indices(Xt_idxlist idxlist, Xt_idx *indices);
static void
idxsection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxsection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes);
static int
......@@ -201,7 +201,7 @@ Xt_idxlist xt_idxstripes_new(struct Xt_stripe const * stripes, Xt_count num_stri
}
static void
idxstripes_delete(xt_idxlist data) {
idxstripes_delete(Xt_idxlist data) {
struct xt_idxstripes *stripes;
......@@ -215,7 +215,7 @@ idxstripes_delete(xt_idxlist data) {
}
static size_t
idxstripes_get_pack_size(xt_idxlist data, MPI_Comm comm) {
idxstripes_get_pack_size(Xt_idxlist data, MPI_Comm comm) {
struct xt_idxstripes *stripes = (struct xt_idxstripes*)data;
......@@ -231,7 +231,7 @@ idxstripes_get_pack_size(xt_idxlist data, MPI_Comm comm) {
}
static void
idxstripes_pack(xt_idxlist data, void *buffer, int buffer_size,
idxstripes_pack(Xt_idxlist data, void *buffer, int buffer_size,
int *position, MPI_Comm comm) {
assert(data);
......@@ -248,7 +248,7 @@ idxstripes_pack(xt_idxlist data, void *buffer, int buffer_size,
buffer_size, position, comm), comm);
}
xt_idxlist xt_idxstripes_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxstripes_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm) {
struct xt_idxstripes *stripes;
......@@ -282,7 +282,7 @@ xt_idxlist xt_idxstripes_unpack(void *buffer, int buffer_size, int *position,
stripes->stripes_overlap = 0;
}
return (xt_idxlist)stripes;
return (Xt_idxlist)stripes;
}
void xt_idxstripes_convert_to_stripes(Xt_idx const * indices,
......@@ -463,7 +463,7 @@ idxstripes_compute_intersection(struct xt_idxstripes *idxstripes_src,
}
static Xt_idxlist
idxstripes_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst) {
idxstripes_get_intersection(Xt_idxlist idxlist_src, Xt_idxlist idxlist_dst) {
if (idxlist_dst->vtable != &idxstripes_vtable) return NULL;
......@@ -482,8 +482,8 @@ idxstripes_get_intersection(xt_idxlist idxlist_src, xt_idxlist idxlist_dst) {
return idxstripes_compute_intersection(idxstripes_src, idxstripes_dst);
}
static xt_idxlist
idxstripes_copy(xt_idxlist idxlist) {
static Xt_idxlist
idxstripes_copy(Xt_idxlist idxlist) {
struct xt_idxstripes *stripes;
......@@ -493,7 +493,7 @@ idxstripes_copy(xt_idxlist idxlist) {
}
static Xt_count
idxstripes_get_num_indices(xt_idxlist idxlist) {
idxstripes_get_num_indices(Xt_idxlist idxlist) {
struct xt_idxstripes * stripes;
......@@ -509,7 +509,7 @@ idxstripes_get_num_indices(xt_idxlist idxlist) {
}
static void
idxstripes_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
idxstripes_get_indices(Xt_idxlist idxlist, Xt_idx *indices) {
struct xt_idxstripes *stripes;
......@@ -523,7 +523,7 @@ idxstripes_get_indices(xt_idxlist idxlist, Xt_idx *indices) {
}
static void
idxsection_get_index_stripes(xt_idxlist idxlist, struct Xt_stripe ** stripes,
idxsection_get_index_stripes(Xt_idxlist idxlist, struct Xt_stripe ** stripes,
Xt_count * num_stripes) {
struct xt_idxstripes *idxstripes;
......
......@@ -14,7 +14,7 @@
*/
Xt_idxlist xt_idxstripes_new(struct Xt_stripe const * stripes, Xt_count num_stripes);
xt_idxlist xt_idxstripes_unpack(void *buffer, int buffer_size, int *position,
Xt_idxlist xt_idxstripes_unpack(void *buffer, int buffer_size, int *position,
MPI_Comm comm);