diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-05-29 11:08:32 +0200 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-05-29 11:08:32 +0200 |
| commit | 1e6f02437e88495d57249f742526526ee5865777 (patch) | |
| tree | af200ec3c23c5d04359ba471d275cfa6d0a3c7fb /src/AllocationPool.h | |
| parent | Merge pull request #2157 from beeduck/Issue2106 (diff) | |
| parent | Merge branch 'master' into PreventNewWarnings (diff) | |
| download | cuberite-1e6f02437e88495d57249f742526526ee5865777.tar cuberite-1e6f02437e88495d57249f742526526ee5865777.tar.gz cuberite-1e6f02437e88495d57249f742526526ee5865777.tar.bz2 cuberite-1e6f02437e88495d57249f742526526ee5865777.tar.lz cuberite-1e6f02437e88495d57249f742526526ee5865777.tar.xz cuberite-1e6f02437e88495d57249f742526526ee5865777.tar.zst cuberite-1e6f02437e88495d57249f742526526ee5865777.zip | |
Diffstat (limited to 'src/AllocationPool.h')
| -rw-r--r-- | src/AllocationPool.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/AllocationPool.h b/src/AllocationPool.h index 7c358cc84..e82f9807e 100644 --- a/src/AllocationPool.h +++ b/src/AllocationPool.h @@ -39,8 +39,8 @@ class cListAllocationPool : public cAllocationPool<T> { public: - cListAllocationPool(std::auto_ptr<typename cAllocationPool<T>::cStarvationCallbacks> a_Callbacks) : - m_Callbacks(a_Callbacks) + cListAllocationPool(std::unique_ptr<typename cAllocationPool<T>::cStarvationCallbacks> a_Callbacks) : + m_Callbacks(std::move(a_Callbacks)) { for (size_t i = 0; i < NumElementsInReserve; i++) { @@ -105,7 +105,7 @@ class cListAllocationPool : public cAllocationPool<T> private: std::list<void *> m_FreeList; - std::auto_ptr<typename cAllocationPool<T>::cStarvationCallbacks> m_Callbacks; + std::unique_ptr<typename cAllocationPool<T>::cStarvationCallbacks> m_Callbacks; }; |