Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
authorMartin Quinson <martin.quinson@loria.fr>
Thu, 9 Apr 2015 19:19:19 +0000 (21:19 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Thu, 9 Apr 2015 19:19:19 +0000 (21:19 +0200)
buildtools/Cmake/DefinePackages.cmake
doc/Doxyfile.in
include/msg/datatypes.h [new file with mode: 0644]
include/msg/msg.h [new file with mode: 0644]
include/simdag/datatypes.h [new file with mode: 0644]
include/simdag/simdag.h [new file with mode: 0644]
src/bindings/java/org/simgrid/msg/Process.java

index 7d18a4f..75b1d8a 100644 (file)
@@ -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
index 005aafa..c3d435b 100644 (file)
@@ -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 (file)
index 0000000..34c965a
--- /dev/null
@@ -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 (file)
index 0000000..e86d89b
--- /dev/null
@@ -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 (file)
index 0000000..571d1aa
--- /dev/null
@@ -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 (file)
index 0000000..6306622
--- /dev/null
@@ -0,0 +1,2 @@
+#warning You should now include directly simgrid/simdag.h instead of simdag/simdag.h
+#include "simgrid/simdag.h"
index 2e4eace..29a69ca 100644 (file)
@@ -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.