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
Add explicit keyword to simgrid::xbt::Task constructor.
[simgrid.git]
/
include
/
xbt
/
Extendable.hpp
diff --git
a/include/xbt/Extendable.hpp
b/include/xbt/Extendable.hpp
index
d90314d
..
785e337
100644
(file)
--- a/
include/xbt/Extendable.hpp
+++ b/
include/xbt/Extendable.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015. The SimGrid Team.
+/* Copyright (c) 2015
, 2017
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-22,7
+22,7
@@
class Extension {
static const std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
std::size_t id_;
friend class Extendable<T>;
static const std::size_t INVALID_ID = std::numeric_limits<std::size_t>::max();
std::size_t id_;
friend class Extendable<T>;
- constexpr Extension(std::size_t id) : id_(id) {}
+
explicit
constexpr Extension(std::size_t id) : id_(id) {}
public:
explicit constexpr Extension() : id_(INVALID_ID) {}
std::size_t id() const { return id_; }
public:
explicit constexpr Extension() : id_(INVALID_ID) {}
std::size_t id() const { return id_; }
@@
-48,7
+48,6
@@
template<class T>
class Extendable {
private:
static std::vector<void(*)(void*)> deleters_;
class Extendable {
private:
static std::vector<void(*)(void*)> deleters_;
-protected:
std::vector<void*> extensions_;
public:
static size_t extension_create(void (*deleter)(void*))
std::vector<void*> extensions_;
public:
static size_t extension_create(void (*deleter)(void*))
@@
-65,7
+64,7
@@
public:
template<class U> static
Extension<T,U> extension_create()
{
template<class U> static
Extension<T,U> extension_create()
{
- return
extension_create([](void* p){ delete static_cast<U*>(p); }
);
+ return
Extension<T, U>(extension_create([](void* p) { delete static_cast<U*>(p); })
);
}
Extendable() : extensions_(deleters_.size(), nullptr) {}
~Extendable()
}
Extendable() : extensions_(deleters_.size(), nullptr) {}
~Extendable()