Remove workaround for g++ 4.8.

[simgrid.git] / include / xbt / functional.hpp

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index 40df428..7205ca8 100644 (file)
--- 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>