aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorColin Snover2017-11-17 23:28:15 -0600
committerEugene Sandulenko2017-11-18 22:35:12 +0100
commit076667dc0064432a3d4e3cf696d6688ee01a17a9 (patch)
tree1c2c622acc4a660109bf0a8ba22c94e8c4ee1c2c /graphics
parent62d6a80c869ee76eeb5abb99b29955399414f71a (diff)
downloadscummvm-rg350-076667dc0064432a3d4e3cf696d6688ee01a17a9.tar.gz
scummvm-rg350-076667dc0064432a3d4e3cf696d6688ee01a17a9.tar.bz2
scummvm-rg350-076667dc0064432a3d4e3cf696d6688ee01a17a9.zip
COMMON: Add limited support for custom deleters to ScopedPtr
Custom deleters of ScopedPtr are not currently fully conforming to C++11's support for custom deleters in std::unique_ptr for the sake of simplicity of implementation. Unlike in the standard library, plain functions and lvalue references are not supported, nor may custom deleters be passed to the constructor at runtime. This can be improved in the future, if necessary, by doing what standard library implementations usually do and creating a Pair class that uses the Empty Base Optimization idiom to avoid extra storage overhead of the deleter instance when it is not needed, as in typical standard library implementations, plus some additional type traits to support the necessary metaprogramming for the different type overloads.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/surface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/surface.h b/graphics/surface.h
index 87c5f52503..19107b8bab 100644
--- a/graphics/surface.h
+++ b/graphics/surface.h
@@ -334,7 +334,7 @@ public:
*
* This deleter assures Surface::free is called on deletion.
*/
-struct SharedPtrSurfaceDeleter {
+struct SurfaceDeleter {
void operator()(Surface *ptr) {
if (ptr) {
ptr->free();