avoid namespace polution (s/aligned/ddt_aligned/)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2781 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h
index 946a0e7..9ead1f7 100644 (file)
--- a/src/gras/DataDesc/datadesc_private.h
+++ b/src/gras/DataDesc/datadesc_private.h
@@ -30,11 +30,11 @@
 #include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
 
 /**
 #include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
 
 /**

- * aligned:
+ * ddt_aligned:

  * 
  * Align the data v on the boundary a.
  */
  * 
  * Align the data v on the boundary a.
  */

-#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
+#define ddt_aligned(v, a) (((v) + (a - 1)) & ~(a - 1))

 
 /*@null@*/extern xbt_set_t gras_datadesc_set_local;
 void gras_ddt_freev(void *ddt);
 
 /*@null@*/extern xbt_set_t gras_datadesc_set_local;
 void gras_ddt_freev(void *ddt);

diff --git a/src/gras/DataDesc/ddt_create.c b/src/gras/DataDesc/ddt_create.c
index d71a49b..4b85d08 100644 (file)
--- a/src/gras/DataDesc/ddt_create.c
+++ b/src/gras/DataDesc/ddt_create.c
@@ -110,7 +110,7 @@ gras_datadesc_type_t
   for (arch = 0; arch < gras_arch_count; arch ++) {
     res->size[arch]         = gras_arches[arch].sizeofs[type];
     res->alignment[arch]    = gras_arches[arch].boundaries[type];
   for (arch = 0; arch < gras_arch_count; arch ++) {
     res->size[arch]         = gras_arches[arch].sizeofs[type];
     res->alignment[arch]    = gras_arches[arch].boundaries[type];

-    res->aligned_size[arch] = aligned(res->size[arch], res->alignment[arch]);
+    res->aligned_size[arch] = ddt_aligned(res->size[arch], res->alignment[arch]);

   }
 
   res->category_code                 = e_gras_datadesc_type_cat_scalar;
   }
 
   res->category_code                 = e_gras_datadesc_type_cat_scalar;


@@ -200,14 +200,14 @@ gras_datadesc_struct_append(gras_datadesc_type_t struct_type,
      
      
   for (arch=0; arch<gras_arch_count; arch ++) {
      
      
   for (arch=0; arch<gras_arch_count; arch ++) {

-    field->offset[arch] = aligned(struct_type->size[arch],
-                                 field_type->alignment[arch]);
+    field->offset[arch] = ddt_aligned(struct_type->size[arch],
+                                     field_type->alignment[arch]);

 
     struct_type->size[arch] = field->offset[arch] + field_type->size[arch];
     struct_type->alignment[arch] = max(struct_type->alignment[arch],
                                       field_type->alignment[arch]);
 
     struct_type->size[arch] = field->offset[arch] + field_type->size[arch];
     struct_type->alignment[arch] = max(struct_type->alignment[arch],
                                       field_type->alignment[arch]);

-    struct_type->aligned_size[arch] = aligned(struct_type->size[arch],
-                                             struct_type->alignment[arch]);
+    struct_type->aligned_size[arch] = ddt_aligned(struct_type->size[arch],
+                                                 struct_type->alignment[arch]);

   }
   field->type   = field_type;
   field->send   = NULL;
   }
   field->type   = field_type;
   field->send   = NULL;


@@ -341,8 +341,8 @@ void gras_datadesc_union_append(gras_datadesc_type_t  union_type,
                                 field_type->size[arch]);
     union_type->alignment[arch] = max(union_type->alignment[arch],
                                      field_type->alignment[arch]);
                                 field_type->size[arch]);
     union_type->alignment[arch] = max(union_type->alignment[arch],
                                      field_type->alignment[arch]);

-    union_type->aligned_size[arch] = aligned(union_type->size[arch],
-                                            union_type->alignment[arch]);
+    union_type->aligned_size[arch] = ddt_aligned(union_type->size[arch],
+                                                union_type->alignment[arch]);

   }
 }
 
   }
 }