ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-02 17:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception safety in aged containers

Browse Source
This commit is contained in:
Vinnie Falco
2014-08-14 13:01:07 -07:00
parent a8ea4ce283
commit 5322955f2b
2 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/beast/beast/container/detail/aged_ordered_container.h
View File

@@ -389,11 +389,26 @@ private:
template <class... Args> template <class... Args>
element* new_element (Args&&... args) element* new_element (Args&&... args)
{ {
element* const p ( struct Deleter
ElementAllocatorTraits::allocate (m_config.alloc(), 1)); {
std::reference_wrapper <ElementAllocator> a_;
Deleter (ElementAllocator& a)
: a_(a)
{
}
void
operator()(element* p)
{
ElementAllocatorTraits::deallocate (a_.get(), p, 1);
}
};
std::unique_ptr <element, Deleter> p (ElementAllocatorTraits::allocate (
m_config.alloc(), 1), Deleter(m_config.alloc()));
ElementAllocatorTraits::construct (m_config.alloc(), ElementAllocatorTraits::construct (m_config.alloc(),
p, clock().now(), std::forward <Args> (args)...); p.get(), clock().now(), std::forward <Args> (args)...);
return p; return p.release();
} }
void delete_element (element const* p) void delete_element (element const* p)

23
src/beast/beast/container/detail/aged_unordered_container.h
View File

@@ -577,11 +577,26 @@ private:
template <class... Args> template <class... Args>
element* new_element (Args&&... args) element* new_element (Args&&... args)
{ {
element* const p ( struct Deleter
ElementAllocatorTraits::allocate (m_config.alloc(), 1)); {
std::reference_wrapper <ElementAllocator> a_;
Deleter (ElementAllocator& a)
: a_(a)
{
}
void
operator()(element* p)
{
ElementAllocatorTraits::deallocate (a_.get(), p, 1);
}
};
std::unique_ptr <element, Deleter> p (ElementAllocatorTraits::allocate (
m_config.alloc(), 1), Deleter(m_config.alloc()));
ElementAllocatorTraits::construct (m_config.alloc(), ElementAllocatorTraits::construct (m_config.alloc(),
p, clock().now(), std::forward <Args> (args)...); p.get(), clock().now(), std::forward <Args> (args)...);
return p; return p.release();
} }
void delete_element (element const* p) void delete_element (element const* p)