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
Remove useless typedef's from C++ files.
[simgrid.git]
/
src
/
kernel
/
routing
/
NetPoint.hpp
diff --git
a/src/kernel/routing/NetPoint.hpp
b/src/kernel/routing/NetPoint.hpp
index
b077a37
..
fd54a2f
100644
(file)
--- a/
src/kernel/routing/NetPoint.hpp
+++ b/
src/kernel/routing/NetPoint.hpp
@@
-1,20
+1,17
@@
-/* Copyright (c) 2013-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-201
7
. 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 KERNEL_ROUTING_NET
CARD
_HPP_
-#define KERNEL_ROUTING_NET
CARD
_HPP_
+#ifndef KERNEL_ROUTING_NET
POINT
_HPP_
+#define KERNEL_ROUTING_NET
POINT
_HPP_
#include <xbt/Extendable.hpp>
#include <xbt/base.h>
#include <xbt/signal.hpp>
#include "src/kernel/routing/NetZoneImpl.hpp"
#include <xbt/Extendable.hpp>
#include <xbt/base.h>
#include <xbt/signal.hpp>
#include "src/kernel/routing/NetZoneImpl.hpp"
-/*
-#include <float.h>
-#include <vector>
-*/
+
namespace simgrid {
namespace kernel {
namespace routing {
namespace simgrid {
namespace kernel {
namespace routing {
@@
-36,7
+33,7
@@
public:
unsigned int id() { return id_; }
std::string name() { return name_; }
const char* cname() { return name_.c_str(); }
unsigned int id() { return id_; }
std::string name() { return name_; }
const char* cname() { return name_.c_str(); }
- /** @brief the NetZone in which this
netcard
is included */
+ /** @brief the NetZone in which this
NetPoint
is included */
NetZoneImpl* netzone() { return netzone_; }
bool isNetZone() { return componentType_ == Type::NetZone; }
NetZoneImpl* netzone() { return netzone_; }
bool isNetZone() { return componentType_ == Type::NetZone; }
@@
-57,6
+54,6
@@
private:
}
}
}
}
-XBT_PUBLIC(sg_net
card_t) sg_netcard
_by_name_or_null(const char* name);
+XBT_PUBLIC(sg_net
point_t) sg_netpoint
_by_name_or_null(const char* name);
-#endif /* KERNEL_ROUTING_NET
CARD
_HPP_ */
+#endif /* KERNEL_ROUTING_NET
POINT
_HPP_ */