diff options
| author | Eugene Sandulenko | 2017-07-10 21:17:41 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-10 21:17:41 +0200 |
| commit | 940b2a20f1cd490afb6e541a3cd26f0d3bdd1687 (patch) | |
| tree | ed080d2edfcc191e2edd4ad61cb8e778e660d422 /backends/networking | |
| parent | c61c0cb0ff6edb53d2ff32efa559e76dd4d086ec (diff) | |
| download | scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.gz scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.tar.bz2 scummvm-rg350-940b2a20f1cd490afb6e541a3cd26f0d3bdd1687.zip | |
Revert "COMMON: Change way the Singleton instances are instantiated"
This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e.
With this patch ConfigManager is broken.
Diffstat (limited to 'backends/networking')
| -rw-r--r-- | backends/networking/curl/connectionmanager.cpp | 6 | ||||
| -rw-r--r-- | backends/networking/sdl_net/localwebserver.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/backends/networking/curl/connectionmanager.cpp b/backends/networking/curl/connectionmanager.cpp index dee4ece742..d8662ab78d 100644 --- a/backends/networking/curl/connectionmanager.cpp +++ b/backends/networking/curl/connectionmanager.cpp @@ -29,6 +29,12 @@ #include "common/timer.h" #include <curl/curl.h> +namespace Common { + +DECLARE_SINGLETON(Networking::ConnectionManager); + +} + namespace Networking { ConnectionManager::ConnectionManager(): _multi(0), _timerStarted(false), _frame(0) { diff --git a/backends/networking/sdl_net/localwebserver.cpp b/backends/networking/sdl_net/localwebserver.cpp index 558bffec26..836b90a244 100644 --- a/backends/networking/sdl_net/localwebserver.cpp +++ b/backends/networking/sdl_net/localwebserver.cpp @@ -51,6 +51,9 @@ namespace Common { class MemoryReadWriteStream; + +DECLARE_SINGLETON(Networking::LocalWebserver); + } namespace Networking { |