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
get it to compile on clang on my machine
[simgrid.git]
/
src
/
surf
/
network_smpi.hpp
diff --git
a/src/surf/network_smpi.hpp
b/src/surf/network_smpi.hpp
index
e16ba5e
..
6ae0b19
100644
(file)
--- a/
src/surf/network_smpi.hpp
+++ b/
src/surf/network_smpi.hpp
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. 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. */
+
#include "network_cm02.hpp"
/***********
#include "network_cm02.hpp"
/***********
@@
-5,7
+11,6
@@
***********/
class NetworkSmpiModel;
***********/
class NetworkSmpiModel;
-typedef NetworkSmpiModel *NetworkSmpiModelPtr;
/*********
* Tools *
/*********
* Tools *
@@
-20,8
+25,9
@@
public:
NetworkSmpiModel();
~NetworkSmpiModel();
NetworkSmpiModel();
~NetworkSmpiModel();
- void gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action);
- void gapRemove(ActionLmmPtr action);
+ using NetworkModel::gapAppend; // Explicit about overloaded method (silence Woverloaded-virtual from clang)
+ void gapAppend(double size, Link* link, NetworkAction *action);
+ void gapRemove(Action *action);
double latencyFactor(double size);
double bandwidthFactor(double size);
double bandwidthConstraint(double rate, double bound, double size);
double latencyFactor(double size);
double bandwidthFactor(double size);
double bandwidthConstraint(double rate, double bound, double size);