aboutsummaryrefslogtreecommitdiff
path: root/backends/fs
diff options
context:
space:
mode:
authorThierry Crozat2017-07-03 18:59:12 +0100
committerEugene Sandulenko2017-07-10 21:11:20 +0200
commiteefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch)
tree97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /backends/fs
parent1141bfc1a603decce8f02a85a1fc76073a646d1a (diff)
downloadscummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.gz
scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.bz2
scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.zip
COMMON: Change way the Singleton instances are instantiated
This fixes tons of warnings with clang from a recent xcode version on macOS (and possibly other systems) complaining that an instantiation of _singleton is required but no definition is available.
Diffstat (limited to 'backends/fs')
-rw-r--r--backends/fs/ds/ds-fs-factory.cpp3
-rw-r--r--backends/fs/ps2/ps2-fs-factory.cpp4
-rw-r--r--backends/fs/psp/psp-fs-factory.cpp4
-rw-r--r--backends/fs/wii/wii-fs-factory.cpp4
4 files changed, 0 insertions, 15 deletions
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp
index 98c522f1d6..e99033eebd 100644
--- a/backends/fs/ds/ds-fs-factory.cpp
+++ b/backends/fs/ds/ds-fs-factory.cpp
@@ -28,9 +28,6 @@
#include "backends/fs/ds/ds-fs.h"
#include "dsmain.h" //for the isGBAMPAvailable() function
-namespace Common {
-DECLARE_SINGLETON(DSFilesystemFactory);
-}
AbstractFSNode *DSFilesystemFactory::makeRootFileNode() const {
if (DS::isGBAMPAvailable()) {
diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp
index 9c12d27a6e..93525eba1a 100644
--- a/backends/fs/ps2/ps2-fs-factory.cpp
+++ b/backends/fs/ps2/ps2-fs-factory.cpp
@@ -28,10 +28,6 @@
#include "backends/fs/ps2/ps2-fs-factory.h"
#include "backends/fs/ps2/ps2-fs.h"
-namespace Common {
-DECLARE_SINGLETON(Ps2FilesystemFactory);
-}
-
AbstractFSNode *Ps2FilesystemFactory::makeRootFileNode() const {
return new Ps2FilesystemNode();
}
diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp
index 303ea242c5..fa92bf42d1 100644
--- a/backends/fs/psp/psp-fs-factory.cpp
+++ b/backends/fs/psp/psp-fs-factory.cpp
@@ -44,10 +44,6 @@
#include <unistd.h>
-namespace Common {
-DECLARE_SINGLETON(PSPFilesystemFactory);
-}
-
AbstractFSNode *PSPFilesystemFactory::makeRootFileNode() const {
return new PSPFilesystemNode();
}
diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp
index f234c1e300..1c95e4e42f 100644
--- a/backends/fs/wii/wii-fs-factory.cpp
+++ b/backends/fs/wii/wii-fs-factory.cpp
@@ -43,10 +43,6 @@
#include <smb.h>
#endif
-namespace Common {
-DECLARE_SINGLETON(WiiFilesystemFactory);
-}
-
WiiFilesystemFactory::WiiFilesystemFactory() :
_dvdMounted(false),
_smbMounted(false),