Merge branch 'master' into adrien

[simgrid.git] / src / bindings / java / JavaContext.hpp

diff --git a/src/bindings/java/JavaContext.hpp b/src/bindings/java/JavaContext.hpp
index 8eef41b..5a7caf6 100644 (file)
--- a/src/bindings/java/JavaContext.hpp
+++ b/src/bindings/java/JavaContext.hpp
@@ -1,6 +1,6 @@
 /* Context switching within the JVM.                                        */
 
-/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -42,7 +42,7 @@ class JavaContextFactory : public simgrid::kernel::context::ContextFactory {
 public:
   JavaContextFactory();
   ~JavaContextFactory() override;
-  JavaContext* create_context(std::function<void()>&& code, smx_actor_t actor) override;
+  Context* create_context(std::function<void()>&& code, actor::ActorImpl* actor) override;
   void run_all() override;
 };
 
@@ -51,4 +51,4 @@ XBT_PRIVATE void java_main_jprocess(jobject process);
 
 }}} // namespace simgrid::kernel::context
 
-#endif                          /* !_XBT_CONTEXT_JAVA_H */
+#endif /* SIMGRID_JAVA_JAVA_CONTEXT_HPP */