From d2bcfd3eafb285dddd08ebb4e24d63b0b68f10e9 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 12 Feb 2016 00:05:05 +0100
Subject: [PATCH] NetCardImpl: automatic and ignorable field renamings

---
 src/surf/surf_routing.hpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 5c59098d20..7b3ed8b155 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -110,23 +110,23 @@ public:
 
 struct XBT_PRIVATE NetCardImpl : public NetCard {
 public:
-  NetCardImpl(const char *name, e_surf_network_element_type_t rcType, As *rcComponent)
-  : p_rcComponent(rcComponent),
-    p_rcType(rcType),
-    p_name(xbt_strdup(name)) {}
-  ~NetCardImpl() { xbt_free(p_name);};
-
-  int getId() {return m_id;}
-  int *getIdPtr() {return &m_id;}
-  void setId(int id) {m_id = id;}
-  char *getName() {return p_name;}
-  As *getRcComponent() {return p_rcComponent;}
-  e_surf_network_element_type_t getRcType() {return p_rcType;}
+  NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *component)
+  : component_(component),
+    componentType_(componentType),
+    name_(xbt_strdup(name)) {}
+  ~NetCardImpl() { xbt_free(name_);};
+
+  int getId() {return id_;}
+  int *getIdPtr() {return &id_;}
+  void setId(int id) {id_ = id;}
+  char *getName() {return name_;}
+  As *getRcComponent() {return component_;}
+  e_surf_network_element_type_t getRcType() {return componentType_;}
 private:
-  As *p_rcComponent;
-  e_surf_network_element_type_t p_rcType;
-  int m_id = -1;
-  char *p_name;
+  As *component_;
+  e_surf_network_element_type_t componentType_;
+  int id_ = -1;
+  char *name_;
 };
 
 /** @ingroup SURF_routing_interface
-- 
2.20.1