update that makes it possible to have empty aligned_storage

[SVN r52804]
This commit is contained in:
Thorsten Jørgen Ottosen
2009-05-06 19:21:17 +00:00
parent 0c934b3466
commit 8d163a019e

View File

@ -54,6 +54,14 @@ struct aligned_storage_imp
, type_with_alignment<alignment_>
>::type align_;
} data_;
void* address() const { return const_cast<aligned_storage_imp*>(this); }
};
template< std::size_t alignment_ >
struct aligned_storage_imp<0u,alignment_>
{
/* intentionally empty */
void* address() const { return 0; }
};
}} // namespace detail::aligned_storage
@ -62,12 +70,9 @@ template <
std::size_t size_
, std::size_t alignment_ = std::size_t(-1)
>
class aligned_storage
class aligned_storage : private detail::aligned_storage::aligned_storage_imp<size_, alignment_>
{
private: // representation
detail::aligned_storage::aligned_storage_imp<size_, alignment_> data_;
public: // constants
typedef detail::aligned_storage::aligned_storage_imp<size_, alignment_> type;
@ -118,14 +123,14 @@ public: // accessors
void* address()
{
return this;
return static_cast<type*>(this)->address();
}
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
const void* address() const
{
return this;
return static_cast<const type*>(this)->address();
}
#else // MSVC6