From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 27 Jan 2019 21:24:40 +0000 (+0100)
Subject: Remove workaround for g++ 4.8.
X-Git-Tag: v3_22~463
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/52d6ec2f2b8b05bff7d3dc0789a7f2b7b400bbc7

Remove workaround for g++ 4.8.

g++ 5.0 or higher is advertised in the doc.
---

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 40df428d55..7205ca8777 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -115,23 +115,11 @@ private:
   struct whatever {};
 
   // Union used for storage:
-#if 0
   typedef typename std::aligned_union<0,
     void*,
     std::pair<void(*)(),void*>,
     std::pair<void(whatever::*)(), whatever*>
   >::type TaskUnion;
-#else
-  union TaskUnion {
-    void* ptr;
-    std::pair<void(*)(),void*> funcptr;
-    std::pair<void(whatever::*)(), whatever*> memberptr;
-    char any1[sizeof(std::pair<void(*)(),void*>)];
-    char any2[sizeof(std::pair<void(whatever::*)(), whatever*>)];
-    TaskUnion() { /* Nothing to do */}
-    ~TaskUnion() { /* Nothing to do */}
-  };
-#endif
 
   // Is F suitable for small buffer optimization?
   template<class F>