TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unnecessary ~jukebox_songs

Browse source 
The storage is managed by a unique_ptr, so the default destructor is
sufficient.
This commit is contained in:
Kp 2016-08-08 00:07:19 +00:00
parent 68ac4acd10
commit 2885070ba8
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
similar/arch/sdl/jukebox.cpp
View file

@ -104,12 +104,10 @@ public:
class jukebox_songs class jukebox_songs
{ {
void quick_unload();
public: public:
~jukebox_songs();
void unload(); void unload();
list_pointers list; // the actual list list_pointers list; // the actual list
int num_songs; // number of jukebox songs unsigned num_songs; // number of jukebox songs
static const std::size_t max_songs = 1024; // maximum number of pointers that 'list' can hold, i.e. size of list / size of one pointer static const std::size_t max_songs = 1024; // maximum number of pointers that 'list' can hold, i.e. size of list / size of one pointer
}; };
@ -117,20 +115,10 @@ public:
static jukebox_songs JukeboxSongs; static jukebox_songs JukeboxSongs;
jukebox_songs::~jukebox_songs()
{
quick_unload();
}
void jukebox_songs::quick_unload()
{
list.reset();
}
void jukebox_songs::unload() void jukebox_songs::unload()
{ {
quick_unload();
num_songs = 0; num_songs = 0;
list.reset();
} }
void jukebox_unload() void jukebox_unload()