diff options
| author | jak1 <jak1@themanaworld.org> | 2023-04-07 03:07:40 +0200 |
|---|---|---|
| committer | jak1 <jak1@themanaworld.org> | 2023-04-07 03:07:40 +0200 |
| commit | 3a722d278d2c864e2705833766edf9c6a261dca0 (patch) | |
| tree | 13bf0efd2d77ba4a922dad996693959ce1fe6c66 /src/utils/dtor.h | |
| parent | 8eb07f82959ea0b97df848386dda0538c63995e7 (diff) | |
| download | manaverse-3a722d278d2c864e2705833766edf9c6a261dca0.tar.gz manaverse-3a722d278d2c864e2705833766edf9c6a261dca0.tar.bz2 manaverse-3a722d278d2c864e2705833766edf9c6a261dca0.tar.xz manaverse-3a722d278d2c864e2705833766edf9c6a261dca0.zip | |
fixed gcc deprecation (unary & not1)
Diffstat (limited to 'src/utils/dtor.h')
| -rw-r--r-- | src/utils/dtor.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/utils/dtor.h b/src/utils/dtor.h index 368aa5ed9..2fb8d1908 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.h @@ -29,19 +29,18 @@ #include "localconsts.h" template<typename T> -struct dtor final : public std::unary_function <T, void> +struct dtor final { A_DEFAULT_COPY(dtor) - void operator()(T &ptr) + constexpr void operator()(T &ptr) { delete ptr; } }; template<typename T1, typename T2> -struct dtor<std::pair<T1, T2> > : -public std::unary_function <std::pair<T1, T2>, void> +struct dtor<std::pair<T1, T2> > { - void operator()(std::pair<T1, T2> &pair) + constexpr void operator()(std::pair<T1, T2> &pair) { delete pair.second; } }; |