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
Merge branch 'master' of github.com:simgrid/simgrid
[simgrid.git]
/
include
/
simgrid
/
jedule
/
jedule_platform.hpp
diff --git
a/include/simgrid/jedule/jedule_platform.hpp
b/include/simgrid/jedule/jedule_platform.hpp
index
9510ad0
..
9d02ade
100644
(file)
--- a/
include/simgrid/jedule/jedule_platform.hpp
+++ b/
include/simgrid/jedule/jedule_platform.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2010-2012, 2014-2017. 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,19
+6,21
@@
#ifndef JED_SIMGRID_PLATFORM_H_
#define JED_SIMGRID_PLATFORM_H_
#ifndef JED_SIMGRID_PLATFORM_H_
#define JED_SIMGRID_PLATFORM_H_
-#include "simgrid_config.h"
-#include "simgrid/forward.h"
-#include "xbt/dynar.h"
+#include <simgrid/forward.h>
+#include <simgrid_config.h>
+#include <xbt/dynar.h>
+
#include <unordered_map>
#include <vector>
#include <string>
#include <unordered_map>
#include <vector>
#include <string>
+
#if SIMGRID_HAVE_JEDULE
namespace simgrid {
namespace jedule{
#if SIMGRID_HAVE_JEDULE
namespace simgrid {
namespace jedule{
-
XBT_PUBLIC_CLASS
Container {
+
class XBT_PUBLIC
Container {
public:
public:
- Container(std::string name);
+
explicit
Container(std::string name);
virtual ~Container();
private:
int last_id;
virtual ~Container();
private:
int last_id;
@@
-39,7
+40,7
@@
public:
void printResources(FILE *file);
};
void printResources(FILE *file);
};
-
XBT_PUBLIC_CLASS
Subset {
+
class XBT_PUBLIC
Subset {
public:
Subset(int s, int n, Container* p);
virtual ~Subset()=default;
public:
Subset(int s, int n, Container* p);
virtual ~Subset()=default;