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

diff --git a/include/gras.h b/include/gras.h
index 5bb8012..c72909b 100644 (file)
--- 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())
 
      (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))
 
 #define max(a, b) (((a) > (b))?(a):(b))
 #define min(a, b) (((a) < (b))?(a):(b))
 


@@ -36,13 +35,15 @@
 
 #include <gras/dynar.h>
 #include <gras/dict.h>
 
 #include <gras/dynar.h>
 #include <gras/dict.h>

+#include <gras/set.h>

 
 #include <gras/config.h>
 
 #include <gras/core.h>
 
 #include <gras/transport.h>
 
 #include <gras/config.h>
 
 #include <gras/core.h>
 
 #include <gras/transport.h>

-#include <gras/datadesc_simple.h>
+#include <gras/datadesc.h>
+//#include <gras/datadesc_simple.h>

 #include <gras/socket.h>
 #include <gras/messages.h>
 
 #include <gras/socket.h>
 #include <gras/messages.h>
 

diff --git a/src/gras/gras_private.h b/src/gras/gras_private.h
index 81f9c5e..0d8517a 100644 (file)
--- 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())
 
      (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))
 
 #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/module.h"
 #include "gras/dynar.h"
 #include "gras/dict.h"

+#include "gras/set.h"

 #include "gras/config.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/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"
 
 #include "gras/socket.h"
 #include "gras/messages.h"