Merge branch 'master' into clean_events

[simgrid.git] / src / smpi / colls / bcast / bcast-arrival-scatter.cpp

diff --git a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
index 578b0f9..3ecba94 100644 (file)
--- a/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
+++ b/src/smpi/colls/bcast/bcast-arrival-scatter.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,7 +13,8 @@
 #ifndef BCAST_ARRIVAL_PATTERN_AWARE_MAX_NODE
 #define BCAST_ARRIVAL_PATTERN_AWARE_MAX_NODE 128
 #endif
-
+namespace simgrid{
+namespace smpi{
 /* Non-topology-specific pipelined linear-bcast function */
 int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
                                           MPI_Datatype datatype, int root,
@@ -60,7 +61,7 @@ int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
   if (count < size) {
     XBT_WARN("MPI_bcast_arrival_scatter use default MPI_bcast.");
     Colls::bcast(buf, count, datatype, root, comm);
-    return MPI_SUCCESS;        
+    return MPI_SUCCESS;
   }
 
 
@@ -192,7 +193,7 @@ int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
              0, tag, comm, &status);
 
     /* at this point all nodes in this set perform all-gather operation */
-    
+
     to = (myordering == (total_nodes - 1)) ? header_buf[0] : header_buf[myordering + 1];
     from = (myordering == 0) ? header_buf[total_nodes - 1] : header_buf[myordering - 1];
 
@@ -231,3 +232,6 @@ int Coll_bcast_arrival_scatter::bcast(void *buf, int count,
 
   return MPI_SUCCESS;
 }
+
+}
+}