From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Tue, 25 Nov 2008 13:05:15 +0000 (+0000)
Subject: Socket/Protocols: Really fix 64bit alignment issue
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=237b6fbe157ccadbcb39aa8cf7f0b432c4b60835;p=senf.git

Socket/Protocols: Really fix 64bit alignment issue

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@979 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/Socket/Protocols/BSDSocketAddress.hh b/Socket/Protocols/BSDSocketAddress.hh
index 9fbc5f0..ec3edfd 100644
--- a/Socket/Protocols/BSDSocketAddress.hh
+++ b/Socket/Protocols/BSDSocketAddress.hh
@@ -114,10 +114,15 @@ namespace senf {
         void socklen(socklen_t len);
 
     private:
-
+        
+        // The following incantation is needed to fix the alignment of the sockaddr data members
+        // which will be added by the derived classes later: The alignment must be forced
+        // to coincide with the struct sockaddr_storage alignment (which must have the largest
+        // alignment of all sockaddr types).
         union {
             socklen_t len_;
-            boost::type_with_alignment<boost::alignment_of<struct sockaddr_storage>::value> _;
+            boost::type_with_alignment<boost::alignment_of<struct sockaddr_storage>::value> a_;
+            char _b[boost::alignment_of<struct sockaddr_storage>::value];
         };
     };