Indentation.

diff --git a/src/mc/mc_unw.cpp b/src/mc/mc_unw.cpp
index ebe8c8e..7566b5a 100644 (file)
--- a/src/mc/mc_unw.cpp
+++ b/src/mc/mc_unw.cpp
@@ -259,7 +259,7 @@ void UnwindContext::initialize(simgrid::mc::RemoteClient* process, unw_context_t
 # endif
 #else
   // Do we need to do any fixup like this?
-  #error Target CPU type is not handled.
+# error Target CPU type is not handled.
 #endif
 }
 

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index 110716b..ac5d691 100644 (file)
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -15,11 +15,11 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 
 extern "C" {
-  #undef CLEANUP
-  #include "dax_dtd.h"
-  #define register /* g++ don't like register, so don't say it */
-  #include "dax_dtd.c"
-  #undef register
+# undef CLEANUP
+# include "dax_dtd.h"
+# define register /* g++ don't like register, so don't say it */
+# include "dax_dtd.c"
+# undef register
 }
 
 /* Ensure that transfer tasks have unique names even though a file is used several times */

diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp
index 8adeecc..587c11b 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_group.cpp
+++ b/src/smpi/bindings/smpi_pmpi_group.cpp
@@ -136,9 +136,8 @@ int PMPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
   } else {
     if (n == 0) {
       *newgroup = group;
-      if (group != MPI_COMM_WORLD->group()
-                && group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY)
-      group->ref();
+      if (group != MPI_COMM_WORLD->group() && group != MPI_COMM_SELF->group() && group != MPI_GROUP_EMPTY)
+        group->ref();
       return MPI_SUCCESS;
     } else if (n == group->size()) {
       *newgroup = MPI_GROUP_EMPTY;

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index 580d0d6..a3b3446 100644 (file)
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -127,10 +127,8 @@ int Group::incl(int n, int* ranks, MPI_Group* newgroup)
     *newgroup = MPI_GROUP_EMPTY;
   } else if (n == size_) {
     *newgroup = this;
-    if(this!= MPI_COMM_WORLD->group()
-              && this != MPI_COMM_SELF->group()
-              && this != MPI_GROUP_EMPTY)
-    this->ref();
+    if (this != MPI_COMM_WORLD->group() && this != MPI_COMM_SELF->group() && this != MPI_GROUP_EMPTY)
+      this->ref();
   } else {
     *newgroup = new Group(n);
     for (i = 0; i < n; i++) {

diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index 4f57f6d..b0c0af6 100644 (file)
--- a/src/smpi/mpi/smpi_request.cpp
+++ b/src/smpi/mpi/smpi_request.cpp
@@ -508,8 +508,8 @@ int Request::test(MPI_Request * request, MPI_Status * status) {
     if (flag) {
       finish_wait(request,status);
       nsleeps=1;//reset the number of sleeps we will do next time
-      if (*request != MPI_REQUEST_NULL && ((*request)->flags_ & PERSISTENT)==0)
-      *request = MPI_REQUEST_NULL;
+      if (*request != MPI_REQUEST_NULL && ((*request)->flags_ & PERSISTENT) == 0)
+        *request = MPI_REQUEST_NULL;
     } else if (xbt_cfg_get_boolean("smpi/grow-injected-times")){
       nsleeps++;
     }
@@ -885,7 +885,7 @@ int Request::waitsome(int incount, MPI_Request requests[], int *indices, MPI_Sta
         status[index] = *pstat;
       }
      if (requests[index] != MPI_REQUEST_NULL && (requests[index]->flags_ & NON_PERSISTENT))
-     requests[index]=MPI_REQUEST_NULL;
+       requests[index] = MPI_REQUEST_NULL;
     }else{
       return MPI_UNDEFINED;
     }

diff --git a/src/xbt/xbt_main.cpp b/src/xbt/xbt_main.cpp
index ffd97cd..f1736ce 100644 (file)
--- a/src/xbt/xbt_main.cpp
+++ b/src/xbt/xbt_main.cpp
@@ -25,10 +25,10 @@
 #include "src/internal_config.h"
 #include <cstdio>
 #ifdef _WIN32
-#include <csignal> /* To silence MSVC on abort() */
+# include <csignal> /* To silence MSVC on abort() */
 #endif
 #if HAVE_UNISTD_H
-#  include <unistd.h>
+# include <unistd.h>
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(module, xbt, "module handling");
@@ -85,7 +85,7 @@ static void xbt_preinit()
 #elif HAVE_SYSCONF
   xbt_pagesize = sysconf(_SC_PAGESIZE);
 #else
-  #error Cannot get page size.
+# error Cannot get page size.
 #endif
 
   xbt_pagebits = log2(xbt_pagesize);