A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
snake_case xbt/future.hpp
[simgrid.git]
/
include
/
simgrid
/
jedule
/
jedule_events.hpp
diff --git
a/include/simgrid/jedule/jedule_events.hpp
b/include/simgrid/jedule/jedule_events.hpp
index
6f57c01
..
5ab0f8f
100644
(file)
--- a/
include/simgrid/jedule/jedule_events.hpp
+++ b/
include/simgrid/jedule/jedule_events.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2010-2012, 2014-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2018. 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. */
/* 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. */
@@
-7,14
+6,15
@@
#ifndef JEDULE_EVENTS_H_
#define JEDULE_EVENTS_H_
#ifndef JEDULE_EVENTS_H_
#define JEDULE_EVENTS_H_
-#include "simgrid_config.h"
-#include "simgrid/forward.h"
+#include <simgrid/jedule/jedule_platform.hpp>
+
+#include <simgrid/forward.h>
+#include <simgrid_config.h>
+
#include <vector>
#include <string>
#include <unordered_map>
#include <vector>
#include <string>
#include <unordered_map>
-#include "jedule_platform.hpp"
-
#if SIMGRID_HAVE_JEDULE
namespace simgrid {
namespace jedule{
#if SIMGRID_HAVE_JEDULE
namespace simgrid {
namespace jedule{
@@
-40,10
+40,7
@@
private:
}
}
}
}
-extern "C" {
typedef simgrid::jedule::Event* jed_event_t;
typedef simgrid::jedule::Event* jed_event_t;
-}
-
#endif
#endif /* JEDULE_EVENTS_H_ */
#endif
#endif /* JEDULE_EVENTS_H_ */