feedc0de/boost_utility
1
0
Fork 0
forked from boostorg/utility
Code Pull Requests Activity

Merged revisions 42236-42288 via svnmerge from

Browse Source 
https://svn.boost.org/svn/boost/trunk

........
  r42247 | grafik | 2007-12-22 16:32:17 -0500 (Sat, 22 Dec 2007) | 1 line
  
  Fix time related callbacks to new arguments.
........
  r42264 | ramey | 2007-12-23 15:00:03 -0500 (Sun, 23 Dec 2007) | 1 line
  
  correction to input of zero length strings
........
  r42266 | turkanis | 2007-12-23 19:27:12 -0500 (Sun, 23 Dec 2007) | 1 line
  
  ported changes from branches/iostreams_dev revisions 42144-42265
........
  r42267 | turkanis | 2007-12-23 19:37:53 -0500 (Sun, 23 Dec 2007) | 1 line
  
  last commit accidentally included a commented out #if directive
........
  r42270 | eric_niebler | 2007-12-23 22:51:59 -0500 (Sun, 23 Dec 2007) | 1 line
  
  add missing #includes
........
  r42274 | troyer | 2007-12-24 02:06:11 -0500 (Mon, 24 Dec 2007) | 1 line
  
  removed warning
........
  r42277 | niels_dekker | 2007-12-24 15:42:16 -0500 (Mon, 24 Dec 2007) | 1 line
  
  value_init now uses aligned_storage::address(), instead of "&x", as recommended by Fernando Cacciola (by mail)
........
  r42278 | niels_dekker | 2007-12-24 17:00:37 -0500 (Mon, 24 Dec 2007) | 1 line
  
  Added value_init tests, testing copy construction and assignment.
........


[SVN r42289]
This commit is contained in:
Eric Niebler
2007-12-25 04:38:53 +00:00
parent e8e82802ba
commit b8509c8984
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/utility/value_init.hpp
View File

@@ -5,9 +5,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
//
// 21 Ago 2002 (Created) Fernando Cacciola
// 07 Set 2007 (Worked around MSVC++ bug) Fernando Cacciola, Niels Dekker
// 16 Nov 2007 (Refactoring: removed private base classes) Fernando Cacciola, Niels Dekker
// 09 Dec 2007 (Worked around various compiler bugs) Fernando Cacciola, Niels Dekker
// 24 Dec 2007 (Refactored and worked around various compiler bugs) Fernando Cacciola, Niels Dekker
//
#ifndef BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP
#define BOOST_UTILITY_VALUE_INIT_21AGO2002_HPP
@@ -30,7 +28,6 @@
// clearing the bytes of T, before constructing the T object it contains.
#include <boost/aligned_storage.hpp>
#include <boost/detail/select_type.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/type_traits/cv_traits.hpp>
#include <boost/type_traits/alignment_of.hpp>
@@ -51,17 +48,13 @@ class value_initialized
remove_const<T>::type data;
};
mutable
#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
typename
#endif
::boost::aligned_storage<sizeof(wrapper), ::boost::alignment_of<wrapper>::value>::type x;
mutable aligned_storage<sizeof(wrapper), alignment_of<wrapper>::value> x;
public :
value_initialized()
{
std::memset(&x, 0, sizeof(x));
std::memset(x.address(), 0, sizeof(x));
#ifdef BOOST_MSVC
#pragma warning(push)
#if _MSC_VER >= 1310
@@ -71,7 +64,7 @@ class value_initialized
#pragma warning(disable: 4345)
#endif
#endif
new (&x) wrapper();
new (x.address()) wrapper();
#ifdef BOOST_MSVC
#pragma warning(pop)
#endif
@@ -79,8 +72,7 @@ class value_initialized
value_initialized(value_initialized const & arg)
{
void const * const ptr = &(arg.x);
new (&x) wrapper( *static_cast<wrapper const *>(ptr) );
new (x.address()) wrapper( *static_cast<wrapper const *>(arg.x.address()) );
}
value_initialized & operator=(value_initialized const & arg)
@@ -93,14 +85,12 @@ class value_initialized
~value_initialized()
{
void * const ptr = &x;
static_cast<wrapper *>(ptr)->wrapper::~wrapper();
static_cast<wrapper *>(x.address())->wrapper::~wrapper();
}
T& data() const
{
void * const ptr = &x;
return static_cast<wrapper *>(ptr)->data;
return static_cast<wrapper *>(x.address())->data;
}
operator T&() const { return this->data(); }

7
value_init_test.cpp
View File

@@ -202,6 +202,13 @@ bool test ( T const& y, T const& z )
x_c_ref = z ;
BOOST_CHECK ( x_c == z ) ;
boost::value_initialized<T> const copy1 = x;
BOOST_CHECK ( boost::get(copy1) == boost::get(x) ) ;
boost::value_initialized<T> copy2;
copy2 = x;
BOOST_CHECK ( boost::get(copy2) == boost::get(x) ) ;
boost::shared_ptr<boost::value_initialized<T> > ptr( new boost::value_initialized<T> );
BOOST_CHECK ( y == *ptr ) ;