From 847b5679d57ac7c9afc2045e996a85db67a96fcf Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 1 Mar 2004 20:54:15 +0000 Subject: [PATCH] add the set, continue to mess with datadesc git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@40 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/gras.h | 5 +++-- src/gras/gras_private.h | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/gras.h b/include/gras.h index 5bb8012244..c72909ba2c 100644 --- a/include/gras.h +++ b/include/gras.h @@ -20,7 +20,6 @@ (fprintf(stderr, "FAILURE: %s(%s:%d)" GS_FAILURE_CONTEXT "%s\n", __func__, __FILE__, __LINE__, (str)), \ abort()) -#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1)) #define max(a, b) (((a) > (b))?(a):(b)) #define min(a, b) (((a) < (b))?(a):(b)) @@ -36,13 +35,15 @@ #include #include +#include #include #include #include -#include +#include +//#include #include #include diff --git a/src/gras/gras_private.h b/src/gras/gras_private.h index 81f9c5e73b..0d8517aca6 100644 --- a/src/gras/gras_private.h +++ b/src/gras/gras_private.h @@ -25,7 +25,6 @@ (fprintf(stderr, "FAILURE: %s(%s:%d)" GS_FAILURE_CONTEXT "%s\n", __func__, __FILE__, __LINE__, (str)), \ abort()) -#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1)) #define max(a, b) (((a) > (b))?(a):(b)) #define min(a, b) (((a) < (b))?(a):(b)) @@ -38,14 +37,16 @@ #include "gras/module.h" #include "gras/dynar.h" #include "gras/dict.h" +#include "gras/set.h" #include "gras/config.h" -#include "gras/data_description.h" -#include "gras/dd_type_bag.h" +//#include "gras/data_description.h" +//#include "gras/dd_type_bag.h" #include "gras/core.h" #include "gras/transport.h" -#include "gras/datadesc_simple.h" +//#include "gras/datadesc_simple.h" +#include "gras/datadesc.h" #include "gras/socket.h" #include "gras/messages.h" -- 2.20.1