From 6af8e5d5f900b90de8b81806405b03afa9e96d67 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sun, 21 Oct 2007 07:28:23 +0000
Subject: [PATCH] Merge from trunk.

[SVN r40260]
---
 include/boost/utility/value_init.hpp | 15 +++++++++++++++
 value_init_test.cpp                  | 18 ++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/include/boost/utility/value_init.hpp b/include/boost/utility/value_init.hpp
index 4cd8e1b..b6d1246 100644
--- a/include/boost/utility/value_init.hpp
+++ b/include/boost/utility/value_init.hpp
@@ -31,6 +31,16 @@
 #include <cstring>
 #include <new>
 
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#if _MSC_VER >= 1310
+// When using MSVC 7.1 or higher, placement new, "new (&x) T()", may trigger warning C4345:
+// "behavior change: an object of POD type constructed with an initializer of the form ()
+// will be default-initialized".  There is no need to worry about this, though.
+#pragma warning(disable: 4345)
+#endif
+#endif
+
 namespace boost {
 
 namespace vinit_detail {
@@ -89,6 +99,11 @@ class non_const_T_base
     mutable typename ::boost::aligned_storage<sizeof(T), ::boost::alignment_of<T>::value>::type x;
 } ;
 
+#ifdef BOOST_MSVC
+// Restores the state of warning C4345.
+#pragma warning(pop)
+#endif
+
 #else
 
 namespace boost {
diff --git a/value_init_test.cpp b/value_init_test.cpp
index 08f9b87..6bca270 100644
--- a/value_init_test.cpp
+++ b/value_init_test.cpp
@@ -60,6 +60,20 @@ struct NonPOD : NonPODBase
   std::string id ;
 } ;
 
+//
+// Sample aggregate POD struct type
+//
+struct AggregatePODStruct
+{
+  float f;
+  char  c;
+  int   i;
+};
+
+bool operator == ( AggregatePODStruct const& lhs, AggregatePODStruct const& rhs )
+{ return lhs.f == rhs.f && lhs.c == rhs.c && lhs.i == rhs.i ; }
+
+
 template<class T>
 void test ( T const& y, T const& z )
 {
@@ -98,6 +112,10 @@ int test_main(int, char **)
   NonPOD NonPOD_object( std::string("NonPOD_object") );
   test<NonPOD *>( 0, &NonPOD_object ) ;
 
+  AggregatePODStruct zeroInitializedAggregatePODStruct = { 0.0f, '\0', 0 };
+  AggregatePODStruct nonZeroInitializedAggregatePODStruct = { 1.25f, 'a', -1 };
+  test(zeroInitializedAggregatePODStruct, nonZeroInitializedAggregatePODStruct);
+
   return 0;
 }