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
Use plain vectors and references for link lists.
[simgrid.git]
/
include
/
simgrid
/
s4u
/
Activity.hpp
diff --git
a/include/simgrid/s4u/Activity.hpp
b/include/simgrid/s4u/Activity.hpp
index
1a6004a
..
4568e52
100644
(file)
--- a/
include/simgrid/s4u/Activity.hpp
+++ b/
include/simgrid/s4u/Activity.hpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. 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,15
+6,10
@@
#ifndef SIMGRID_S4U_ACTIVITY_HPP
#define SIMGRID_S4U_ACTIVITY_HPP
#ifndef SIMGRID_S4U_ACTIVITY_HPP
#define SIMGRID_S4U_ACTIVITY_HPP
-#include <cstdlib>
-
-#include <xbt/base.h>
-#include <xbt/misc.h>
-
#include <simgrid/s4u/forward.hpp>
#include <simgrid/forward.h>
#include <simgrid/s4u/forward.hpp>
#include <simgrid/forward.h>
-
typedef enum { inited = 0, started = 1, canceled = 2, errored, finished } e_s4u_activity_state_t
;
+
enum e_s4u_activity_state_t { inited = 0, started, canceled, errored, finished }
;
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-30,8
+24,8
@@
XBT_PUBLIC_CLASS Activity {
friend void intrusive_ptr_add_ref(Comm * c);
protected:
friend void intrusive_ptr_add_ref(Comm * c);
protected:
- Activity();
- virtual ~Activity();
+ Activity()
= default
;
+ virtual ~Activity()
= default
;
public:
Activity(Activity const&) = delete;
public:
Activity(Activity const&) = delete;
@@
-67,7
+61,7
@@
public:
void *getUserData() { return userData_; }
private:
void *getUserData() { return userData_; }
private:
- simgrid::kernel::activity::ActivityImpl
*
pimpl_ = nullptr;
+ simgrid::kernel::activity::ActivityImpl
Ptr
pimpl_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
void *userData_ = nullptr;
e_s4u_activity_state_t state_ = inited;
double remains_ = 0;
void *userData_ = nullptr;