From f8a4f01a866b1dfbc94858285d02a9e5a87d9bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Wed, 30 Sep 2015 22:39:44 +0200 Subject: [PATCH] Fixed Trac #11698 ("Missing return statement in static_storage_allocator") --- doc/container.qbk | 1 + include/boost/container/static_vector.hpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/container.qbk b/doc/container.qbk index 47a72a5..2462368 100644 --- a/doc/container.qbk +++ b/doc/container.qbk @@ -1222,6 +1222,7 @@ use [*Boost.Container]? There are several reasons for that: * [@https://svn.boost.org/trac/boost/ticket/11627 Trac #11627: ['"small_vector::swap() appears to be broken"]]. * [@https://svn.boost.org/trac/boost/ticket/11628 Trac #11628: ['"small_vector iterates over elements in destructor"]]. * [@https://svn.boost.org/trac/boost/ticket/11697 Trac #11697: ['"Wrong initialization order in tuple copy-constructor"]]. + * [@https://svn.boost.org/trac/boost/ticket/11698 Trac #11698: ['"Missing return statement in static_storage_allocator"]]. [endsect] diff --git a/include/boost/container/static_vector.hpp b/include/boost/container/static_vector.hpp index b6e0551..69540dc 100644 --- a/include/boost/container/static_vector.hpp +++ b/include/boost/container/static_vector.hpp @@ -48,7 +48,7 @@ class static_storage_allocator {} static_storage_allocator & operator=(const static_storage_allocator &) BOOST_NOEXCEPT_OR_NOTHROW - {} + { return *this; } T* internal_storage() const BOOST_NOEXCEPT_OR_NOTHROW { return const_cast(static_cast(static_cast(&storage))); }