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
char* to string == free--
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
ecdb950
..
d7ff3ce
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,13
+1,12
@@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-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. */
+
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
#ifndef NETWORK_NS3_HPP_
#define NETWORK_NS3_HPP_
-
-#include <xbt/base.h>
+#include "xbt/base.h"
#include "network_interface.hpp"
#include "src/surf/ns3/ns3_interface.h"
#include "network_interface.hpp"
#include "src/surf/ns3/ns3_interface.h"
@@
-50,11
+49,12
@@
public:
NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
bool isSuspended();
NetworkNS3Action(Model* model, double cost, s4u::Host* src, s4u::Host* dst);
bool isSuspended();
- int unref();
- void suspend();
- void resume();
+ int unref() override;
+ void suspend() override;
+ void resume() override;
+ std::list<LinkImpl*> links() override;
-
//
private:
+
//
private:
double lastSent_ = 0;
s4u::Host* src_;
s4u::Host* dst_;
double lastSent_ = 0;
s4u::Host* src_;
s4u::Host* dst_;