convert getCname to get_cname

[simgrid.git] / include / simgrid / s4u / Activity.hpp

diff --git a/include/simgrid/s4u/Activity.hpp b/include/simgrid/s4u/Activity.hpp
index 905daa3..c508d9d 100644 (file)
--- a/include/simgrid/s4u/Activity.hpp
+++ b/include/simgrid/s4u/Activity.hpp
@@ -18,7 +18,7 @@ namespace s4u {
  *
  * This class is the ancestor of every activities that an actor can undertake, that is, of the actions that do take time in the simulated world.
  */
-XBT_PUBLIC_CLASS Activity {
+class XBT_PUBLIC Activity {
   friend Comm;
   friend XBT_PUBLIC void intrusive_ptr_release(Comm * c);
   friend XBT_PUBLIC void intrusive_ptr_add_ref(Comm * c);
@@ -61,17 +61,17 @@ public:
   /** Put some user data onto the Activity */
   Activity* setUserData(void* data)
   {
-    userData_ = data;
+    user_data_ = data;
     return this;
   }
   /** Retrieve the user data of the Activity */
-  void *getUserData() { return userData_; }
+  void* getUserData() { return user_data_; }
 
 private:
   simgrid::kernel::activity::ActivityImplPtr pimpl_ = nullptr;
   e_s4u_activity_state_t state_ = inited;
   double remains_ = 0;
-  void *userData_ = nullptr;
+  void* user_data_                                  = nullptr;
 }; // class
 
 }}; // Namespace simgrid::s4u