Merge remote-tracking branch 'origin/master'

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 601733f..1364aaa 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -10,6 +10,7 @@
 
 #include "jmsg.h"
 #include "jmsg_host.h"
+#include "jmsg_proces.h"
 #include "jxbt_utilities.h"
 #include "JavaContext.hpp"
 

diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp
index 7940f7a..0977910 100644 (file)
--- a/src/bindings/java/jmsg_task.cpp
+++ b/src/bindings/java/jmsg_task.cpp
@@ -10,6 +10,7 @@
 
 #include "jmsg_host.h"
 #include "jmsg_task.h"
+#include "jmsg_process.h"
 
 #include "jxbt_utilities.h"
 
@@ -17,8 +18,6 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(jmsg);
 
-jobject native_to_java_process(msg_process_t process);
-
 static jmethodID jtask_method_Comm_constructor;
 
 static jfieldID jtask_field_Task_bind;

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 0da957e..d71fe5d 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -676,7 +676,7 @@ void routing_model_create( void *loopback)
 void routing_cluster_add_backbone(void* bb) {
   xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER],
         "You have to be in model Cluster to use tag backbone!");
-  xbt_assert(!static_cast<AsCluster*>(current_routing)->p_backbone, "The backbone link is already defined!");
+  xbt_assert(!static_cast<simgrid::surf::AsCluster*>(current_routing)->p_backbone, "The backbone link is already defined!");
   static_cast<simgrid::surf::AsCluster*>(current_routing)->p_backbone =
     static_cast<simgrid::surf::Link*>(bb);
   XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name);

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 4c342f5..dc9b9bf 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -874,8 +874,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/src/simix/ThreadContext.cpp
-    src/simix/src/simix/ThreadContext.hpp
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )