From bef8e90150dc6e6e18b621ceb33c0e0a3ca15edc Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Tue, 11 Dec 2007 17:18:06 +0000
Subject: [PATCH] Merge fix for #1504.

[SVN r41969]
---
 include/boost/type_traits/alignment_of.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/boost/type_traits/alignment_of.hpp b/include/boost/type_traits/alignment_of.hpp
index f18d422..e8e4834 100644
--- a/include/boost/type_traits/alignment_of.hpp
+++ b/include/boost/type_traits/alignment_of.hpp
@@ -17,7 +17,7 @@
 
 #ifdef BOOST_MSVC
 #   pragma warning(push)
-#   pragma warning(disable: 4121) // alignment is sensitive to packing
+#   pragma warning(disable: 4121 4512) // alignment is sensitive to packing
 #endif
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
 #pragma option push -Vx- -Ve-