diff options
Diffstat (limited to 'src/options.cpp')
-rw-r--r-- | src/options.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/options.cpp b/src/options.cpp index 199ef04..815cee0 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -150,19 +150,12 @@ std::istream& operator>>(std::istream& stream, OptionNetwork& network) return stream; } -Options* Options::inst = NULL; -Mutex Options::instMutex; Options& gOpt = Options::instance(); Options& Options::instance() { - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) { - inst = new Options(); - } - - return *inst; + static Options instance; + return instance; } Options::Options() : key_(uint32_t(0)), salt_(uint32_t(0)) |