From 3ad51daf5c4c7d42a0e55e00498b0c9de202b9e4 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 10 Feb 2017 15:33:02 +0100
Subject: [PATCH] cosmetics

---
 include/simgrid/s4u/Actor.hpp  |  2 +-
 src/s4u/s4u_link.cpp           | 12 ++++++------
 src/surf/network_interface.hpp |  7 +------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index 55a308bff8..1eb18d1ffc 100644
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -134,7 +134,7 @@ namespace s4u {
 XBT_PUBLIC_CLASS Actor {
   friend Mailbox;
   friend simgrid::simix::ActorImpl;
-  smx_actor_t pimpl_ = nullptr;
+  simix::ActorImpl* pimpl_ = nullptr;
 
   /** Wrap a (possibly non-copyable) single-use task into a `std::function` */
   template<class F, class... Args>
diff --git a/src/s4u/s4u_link.cpp b/src/s4u/s4u_link.cpp
index 7f9802f1b5..b1ce7b1234 100644
--- a/src/s4u/s4u_link.cpp
+++ b/src/s4u/s4u_link.cpp
@@ -85,26 +85,26 @@ Link* Link::byName(const char* name)
 }
 const char* Link::name()
 {
-  return pimpl_->getName();
+  return this->pimpl_->getName();
 }
 bool Link::isUsed()
 {
-  return pimpl_->isUsed();
+  return this->pimpl_->isUsed();
 }
 
 double Link::latency()
 {
-  return pimpl_->latency();
+  return this->pimpl_->latency();
 }
 
 double Link::bandwidth()
 {
-  return pimpl_->bandwidth();
+  return this->pimpl_->bandwidth();
 }
 
 int Link::sharingPolicy()
 {
-  return pimpl_->sharingPolicy();
+  return this->pimpl_->sharingPolicy();
 }
 
 void Link::turnOn()
@@ -122,7 +122,7 @@ void Link::turnOff()
 
 void* Link::getData()
 {
-  return pimpl_->getData();
+  return this->pimpl_->getData();
 }
 void Link::setData(void* d)
 {
diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index f0838b6593..914cca5a5f 100644
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -126,13 +126,8 @@ namespace simgrid {
      * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl)
      */
     class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
-    public:
-      /** @brief Constructor of LMM links */
-      LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint);
-
-      /* Link destruction logic */
-      /**************************/
     protected:
+      LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint);
       ~LinkImpl() override;
     public:
       void destroy(); // Must be called instead of the destructor
-- 
2.20.1