From a96f7edb18f2feb5d94d7d1b6024c381d21bb559 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 18 Dec 2020 10:15:52 +0100
Subject: [PATCH] No need for <void> specialization.

---
 include/simgrid/s4u/Mailbox.hpp | 31 +++++++++++++++++++++++++------
 src/s4u/s4u_Mailbox.cpp         | 28 ----------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp
index aac352a533..6837914c36 100644
--- a/include/simgrid/s4u/Mailbox.hpp
+++ b/include/simgrid/s4u/Mailbox.hpp
@@ -8,6 +8,7 @@
 
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Actor.hpp>
+#include <simgrid/s4u/Comm.hpp>
 #include <smpi/forward.hpp>
 #include <xbt/string.hpp>
 
@@ -96,22 +97,40 @@ public:
   CommPtr get_init();
   /** Creates and start an async data reception to that mailbox */
   XBT_ATTRIB_DEPRECATED_v331("Please use typed template Mailbox::get_async<>()") CommPtr get_async(void** data);
-  template <typename T> CommPtr get_async(T** data) { return get_async<void>(reinterpret_cast<void**>(data)); }
+  template <typename T> CommPtr get_async(T** data);
 
   /** Blocking data reception */
-  template <typename T> T* get() { return static_cast<T*>(get<void>()); }
+  template <typename T> T* get();
   XBT_ATTRIB_DEPRECATED_v331("Please use typed template Mailbox::get<>()") void* get();
   template <typename T> std::unique_ptr<T> get_unique() { return std::unique_ptr<T>(get<T>()); }
 
   /** Blocking data reception with timeout */
-  template <typename T> T* get(double timeout) { return static_cast<T*>(get<void>(timeout)); }
+  template <typename T> T* get(double timeout);
   XBT_ATTRIB_DEPRECATED_v331("Please use typed template Mailbox::get<>()") void* get(double timeout);
   template <typename T> std::unique_ptr<T> get_unique(double timeout) { return std::unique_ptr<T>(get<T>(timeout)); }
 };
 
-template <> XBT_PUBLIC CommPtr Mailbox::get_async<void>(void** data);
-template <> XBT_PUBLIC void* Mailbox::get<void>();
-template <> XBT_PUBLIC void* Mailbox::get<void>(double timeout);
+template <typename T> CommPtr Mailbox::get_async(T** data)
+{
+  CommPtr res = get_init();
+  res->set_dst_data(reinterpret_cast<void**>(data), sizeof(void*));
+  res->vetoable_start();
+  return res;
+}
+
+template <typename T> T* Mailbox::get()
+{
+  T* res = nullptr;
+  get_async<T>(&res)->wait();
+  return res;
+}
+
+template <typename T> T* Mailbox::get(double timeout)
+{
+  T* res = nullptr;
+  get_async<T>(&res)->wait_for(timeout);
+  return res;
+}
 
 inline CommPtr Mailbox::get_async(void** data) // XBT_ATTRIB_DEPRECATED_v331
 {
diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp
index 83b8d72242..1dd3ffd902 100644
--- a/src/s4u/s4u_Mailbox.cpp
+++ b/src/s4u/s4u_Mailbox.cpp
@@ -138,34 +138,6 @@ CommPtr Mailbox::get_init()
   return res;
 }
 
-template <> CommPtr Mailbox::get_async<void>(void** data)
-{
-  CommPtr res = get_init();
-  res->set_dst_data(data, sizeof(*data));
-  res->vetoable_start();
-  return res;
-}
-
-template <> void* Mailbox::get<void>()
-{
-  void* res = nullptr;
-  CommPtr c = get_init();
-  c->set_dst_data(&res, sizeof(res));
-  c->vetoable_start();
-  c->wait();
-  return res;
-}
-
-template <> void* Mailbox::get<void>(double timeout)
-{
-  void* res = nullptr;
-  CommPtr c = get_init();
-  c->set_dst_data(&res, sizeof(res));
-  c->vetoable_start();
-  c->wait_for(timeout);
-  return res;
-}
-
 kernel::activity::ActivityImplPtr
 Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
 {
-- 
2.20.1