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

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index 8bfa333..9e165cb 100644 (file)
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -65,7 +65,7 @@ Recompiling an official archive is not much more complex. SimGrid only uses very
   - C compiler, C++ compiler, make and friends. SimGrid is rather
     demanding on the compiler. We use the C++11 standard, and older
     compilers tend to fail on us. It seems that g++ 5.0 or higher is
-    required nowadays. 
+    required nowadays (because of boost).
   - perl (but you may try to go without it)
   - We use cmake to configure our compilation
       ([download page](http://www.cmake.org/cmake/resources/software.html)).

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 840bd7d..4c24f32 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -22,8 +22,7 @@
  */
 
 /* XBT_LOG_MAYDAY: define this to replace the logging facilities with basic
-   printf function. Useful to debug the logging facilities themselves */
-#undef XBT_LOG_MAYDAY
+   printf function. Useful to debug the logging facilities themselves, or to not make source analysis tools mad */
 //#define XBT_LOG_MAYDAY
 
 #ifndef _XBT_LOG_H_

diff --git a/sonar-project.properties b/sonar-project.properties
index 00c6270..e83783f 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -31,5 +31,8 @@ sonar.sourceEncoding=UTF-8
 sonar.cpp.std=gnu++11
 sonar.c.std=gnu11
 
+# Disable the whole logging mechanism during SonarQube analysis
+sonar.cfamily.predefinedMacros=XBT_LOG_MAYDAY
+
 # Talk to me (travis don't like it, it's too much)
 # sonar.verbose=true

diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp
index 3e46ece..f8c7e74 100644 (file)
--- a/src/simix/smx_context.cpp
+++ b/src/simix/smx_context.cpp
@@ -6,11 +6,16 @@
 /* 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. */
 
+#include <cerrno>
+#include <cstring>
+
 #include <utility>
 #include <string>
 
 #include <xbt/config.hpp>
+#include <xbt/log.h>
 #include <xbt/range.hpp>
+#include <xbt/sysdep.h>
 
 #include "src/internal_config.h"
 #include "xbt/log.h"