From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 9 Apr 2015 19:19:19 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_12~732^2~61^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ec855b2eab2825f3870232ef7e0a804963231b0e?hp=768c291376d7b5af94ee026c168b117bc27d9ad1

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 7d18a4f464..75b1d8aaad 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -630,6 +630,11 @@ set(MC_SRC
   )
 
 set(headers_to_install
+  include/msg/msg.h
+  include/msg/datatypes.h
+  include/simdag/simdag.h
+  include/simdag/datatypes.h
+  
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 005aafa326..c3d435b5ba 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -676,7 +676,6 @@ INPUT                  = doxygen/index.doc \
                          @top_srcdir@/src/instr/ \
                          @bindir@/include \
                          @top_srcdir@/include/ \
-                         @top_srcdir@/include/msg \
                          @top_srcdir@/include/xbt \
                          @top_srcdir@/include/simgrid \
                          @top_srcdir@/src/include/surf \
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
new file mode 100644
index 0000000000..34c965a4d0
--- /dev/null
+++ b/include/msg/datatypes.h
@@ -0,0 +1,2 @@
+#warning You should now include directly simgrid/msg.h instead of msg/datatypes.h
+#include "simgrid/msg.h"
diff --git a/include/msg/msg.h b/include/msg/msg.h
new file mode 100644
index 0000000000..e86d89b1b1
--- /dev/null
+++ b/include/msg/msg.h
@@ -0,0 +1,2 @@
+#warning You should now include directly simgrid/msg.h instead of msg/msg.h
+#include "simgrid/msg.h"
diff --git a/include/simdag/datatypes.h b/include/simdag/datatypes.h
new file mode 100644
index 0000000000..571d1aa52f
--- /dev/null
+++ b/include/simdag/datatypes.h
@@ -0,0 +1,2 @@
+#warning You should now include directly simgrid/simdag.h instead of simdag/datatypes.h
+#include "simgrid/simdag.h"
diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h
new file mode 100644
index 0000000000..630662208a
--- /dev/null
+++ b/include/simdag/simdag.h
@@ -0,0 +1,2 @@
+#warning You should now include directly simgrid/simdag.h instead of simdag/simdag.h
+#include "simgrid/simdag.h"
diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java
index 2e4eace031..29a69ca6ce 100644
--- a/src/bindings/java/org/simgrid/msg/Process.java
+++ b/src/bindings/java/org/simgrid/msg/Process.java
@@ -299,7 +299,8 @@ public abstract class Process implements Runnable {
 	/**
 	 * Makes the current process sleep until millis milliseconds and nanos nanoseconds 
 	 * have elapsed.
-	 * You should note that unlike "waitFor" which takes seconds, this method takes milliseconds and nanoseconds.
+	 * Unlike {@link #waitFor(double)} which takes seconds, this method takes 
+	 * milliseconds and nanoseconds.
 	 * Overloads Thread.sleep.
 	 * @param millis the length of time to sleep in milliseconds.
 	 * @param nanos additionnal nanoseconds to sleep.