Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / smpi / colls / coll_tuned_topo.c

diff --git a/src/smpi/colls/coll_tuned_topo.c b/src/smpi/colls/coll_tuned_topo.c
index ce7cec7..a5c53b1 100644 (file)
--- a/src/smpi/colls/coll_tuned_topo.c
+++ b/src/smpi/colls/coll_tuned_topo.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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. */
+
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -9,11 +15,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * $COPYRIGHT$
  * 
  * Additional copyrights may follow
- * 
- * $HEADER$
  */
 
 #include "colls_private.h"
@@ -421,7 +424,7 @@ ompi_coll_tuned_topo_build_in_order_bmtree( MPI_Comm comm,
 
     vrank = (rank - root + size) % size;
 
-    bmtree = (ompi_coll_tree_t*)malloc(sizeof(ompi_coll_tree_t));
+    bmtree = (ompi_coll_tree_t*)xbt_malloc(sizeof(ompi_coll_tree_t));
     if (!bmtree) {
         XBT_DEBUG("coll:tuned:topo:build_bmtree PANIC out of memory");
         return NULL;