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
Xml platform cleaning teshsuite/msg
[simgrid.git]
/
src
/
surf
/
network_ns3.hpp
diff --git
a/src/surf/network_ns3.hpp
b/src/surf/network_ns3.hpp
index
8aab263
..
dbd1132
100644
(file)
--- a/
src/surf/network_ns3.hpp
+++ b/
src/surf/network_ns3.hpp
@@
-1,7
+1,9
@@
/* Copyright (c) 2004-2014. The SimGrid Team.
/* Copyright (c) 2004-2014. The SimGrid Team.
- *
- * 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
* under the terms of the license (GNU LGPL) which comes with this package. */
* under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "network_interface.hpp"
#include "surf/ns3/ns3_interface.h"
#include "network_interface.hpp"
#include "surf/ns3/ns3_interface.h"
@@
-35,7
+37,7
@@
public:
NetworkNS3Model();
~NetworkNS3Model();
NetworkNS3Model();
~NetworkNS3Model();
- NetworkLinkPtr create
Resource
(const char *name,
+ NetworkLinkPtr create
NetworkLink
(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
@@
-49,6
+51,7
@@
public:
double size, double rate);
double shareResources(double now);
void updateActionsState(double now, double delta);
double size, double rate);
double shareResources(double now);
void updateActionsState(double now, double delta);
+ void addTraces(){DIE_IMPOSSIBLE;}
};
/************
};
/************