From: Felipe Sateler <fsateler@debian.org>
Date: Fri, 6 Jun 2014 17:15:18 +0000 (-0400)
Subject: Fix implementation of aligned_allocator::construct<U>.
X-Git-Tag: archive/raspbian/1%3.10.4+repack-1+rpi1^2^2^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e60b26a09175de74f3d6fe613a405d96c92d2f30;p=supercollider.git

Fix implementation of aligned_allocator::construct<U>.

Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.

A typo, apparently. This patch can be dropped in the next upstream release.

Gbp-Pq: Name ftbfs-gcc-4.9.patch
---

diff --git a/server/supernova/utilities/malloc_aligned.hpp b/server/supernova/utilities/malloc_aligned.hpp
index e572dcb..89277ff 100644
--- a/server/supernova/utilities/malloc_aligned.hpp
+++ b/server/supernova/utilities/malloc_aligned.hpp
@@ -243,7 +243,7 @@ public:
     template< class U, class... Args >
     void construct(U * p, Args&& ... args)
     {
-        ::new(p) T(std::forward<Args>(args)...);
+        ::new(p) U(std::forward<Args>(args)...);
     }
 #endif