summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2020-01-31 14:53:46 +1100
committer Vas Crabb <vas@vastheman.com>2020-01-31 14:53:46 +1100
commit3536bbdd7167b3982deca3e91960658ac620fdf1 (patch)
tree2c7ebf9e8c7a0736ae68a9231de1e2420f0c5da5 /src/lib
parenta984b33ada3bf472333e178a68fdb160faf3151f (diff)
there are reasons for things being the way they were (nw)
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/util/corefile.cpp9
-rw-r--r--src/lib/util/corefile.h2
-rw-r--r--src/lib/util/options.cpp27
-rw-r--r--src/lib/util/options.h6
-rw-r--r--src/lib/util/unzip.cpp5
-rw-r--r--src/lib/util/unzip.h2
-rw-r--r--src/lib/util/zippath.cpp10
-rw-r--r--src/lib/util/zippath.h2
8 files changed, 57 insertions, 6 deletions
diff --git a/src/lib/util/corefile.cpp b/src/lib/util/corefile.cpp
index 1fe33c7e348..d241dac6ed1 100644
--- a/src/lib/util/corefile.cpp
+++ b/src/lib/util/corefile.cpp
@@ -1162,6 +1162,15 @@ osd_file::error core_file::open_proxy(core_file &file, ptr &proxy)
/*-------------------------------------------------
+ closes a file
+-------------------------------------------------*/
+
+core_file::~core_file()
+{
+}
+
+
+/*-------------------------------------------------
load - open a file with the specified
filename, read it into memory, and return a
pointer
diff --git a/src/lib/util/corefile.h b/src/lib/util/corefile.h
index cfbe57227d3..99496b964e8 100644
--- a/src/lib/util/corefile.h
+++ b/src/lib/util/corefile.h
@@ -61,7 +61,7 @@ public:
static osd_file::error open_proxy(core_file &file, ptr &proxy);
// close an open file
- virtual ~core_file() = default;
+ virtual ~core_file();
// enable/disable streaming file compression via zlib; level is 0 to disable compression, or up to 9 for max compression
virtual osd_file::error compress(int level) = 0;
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp
index cbc9c817dbf..fd0783ccaae 100644
--- a/src/lib/util/options.cpp
+++ b/src/lib/util/options.cpp
@@ -126,6 +126,15 @@ core_options::entry::entry(std::string &&name, core_options::option_type type, c
//-------------------------------------------------
+// entry - destructor
+//-------------------------------------------------
+
+core_options::entry::~entry()
+{
+}
+
+
+//-------------------------------------------------
// entry::value
//-------------------------------------------------
@@ -328,6 +337,15 @@ core_options::simple_entry::simple_entry(std::vector<std::string> &&names, const
//-------------------------------------------------
+// simple_entry - destructor
+//-------------------------------------------------
+
+core_options::simple_entry::~simple_entry()
+{
+}
+
+
+//-------------------------------------------------
// simple_entry::value
//-------------------------------------------------
@@ -405,6 +423,15 @@ const char *core_options::simple_entry::maximum() const noexcept
//**************************************************************************
//-------------------------------------------------
+// ~core_options - destructor
+//-------------------------------------------------
+
+core_options::~core_options()
+{
+}
+
+
+//-------------------------------------------------
// add_entry - adds an entry
//-------------------------------------------------
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index dc86786fed1..a28720a0373 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -111,7 +111,7 @@ public:
entry(entry &&) = delete;
entry& operator=(const entry &) = delete;
entry& operator=(entry &&) = delete;
- virtual ~entry() = default;
+ virtual ~entry();
// accessors
const std::vector<std::string> &names() const noexcept { return m_names; }
@@ -152,7 +152,7 @@ public:
core_options(core_options &&) = default;
core_options& operator=(const core_options &) = delete;
core_options& operator=(core_options &&) = default;
- virtual ~core_options() = default;
+ virtual ~core_options();
// getters
const std::string &command() const noexcept { return m_command; }
@@ -213,7 +213,7 @@ private:
simple_entry(simple_entry &&) = delete;
simple_entry& operator=(const simple_entry &) = delete;
simple_entry& operator=(simple_entry &&) = delete;
- ~simple_entry() = default;
+ virtual ~simple_entry();
// getters
virtual const char *value() const noexcept override;
diff --git a/src/lib/util/unzip.cpp b/src/lib/util/unzip.cpp
index 2fb3da55c3c..a659445e1cc 100644
--- a/src/lib/util/unzip.cpp
+++ b/src/lib/util/unzip.cpp
@@ -1479,4 +1479,9 @@ void archive_file::cache_clear()
m7z_file_cache_clear();
}
+
+archive_file::~archive_file()
+{
+}
+
} // namespace util
diff --git a/src/lib/util/unzip.h b/src/lib/util/unzip.h
index 28d348a5738..a1388cd0b4c 100644
--- a/src/lib/util/unzip.h
+++ b/src/lib/util/unzip.h
@@ -57,7 +57,7 @@ public:
static error open_7z(const std::string &filename, ptr &result);
// close an archive file (may actually be left open due to caching)
- virtual ~archive_file() = default;
+ virtual ~archive_file();
// clear out all open files from the cache
static void cache_clear();
diff --git a/src/lib/util/zippath.cpp b/src/lib/util/zippath.cpp
index 3dcccd5ee30..760c64fd066 100644
--- a/src/lib/util/zippath.cpp
+++ b/src/lib/util/zippath.cpp
@@ -615,6 +615,16 @@ osd_file::error zippath_directory::open(std::string const &path, ptr &directory)
// -------------------------------------------------
+// zippath_directory::~zippath_directory - closes
+// a directory
+// -------------------------------------------------
+
+zippath_directory::~zippath_directory()
+{
+}
+
+
+// -------------------------------------------------
// zippath_parent - retrieves the parent directory
// -------------------------------------------------
diff --git a/src/lib/util/zippath.h b/src/lib/util/zippath.h
index bbaf21af8b1..cf6c2249f9c 100644
--- a/src/lib/util/zippath.h
+++ b/src/lib/util/zippath.h
@@ -34,7 +34,7 @@ public:
static osd_file::error open(std::string const &path, ptr &directory);
// closes a directory
- virtual ~zippath_directory() = default;
+ virtual ~zippath_directory();
// reads a directory entry
virtual osd::directory::entry const *readdir() = 0;