Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-29 02:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Storage: Use unique_ptr for instance.

Browse Source
This commit is contained in:
Peter Johnson
2015-07-14 23:15:08 -07:00
committed by Peter Johnson
parent dbd0c98306
commit 4d3fb3c497
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storage.cpp
View File

@@ -15,7 +15,7 @@
using namespace ntimpl;
Storage* Storage::m_instance = nullptr;
std::unique_ptr<Storage> Storage::m_instance;
Storage::Storage() {}

9
src/Storage.h
View File

@@ -8,8 +8,9 @@
#ifndef NT_STORAGE_H_
#define NT_STORAGE_H_
#include <iosfwd>
#include <cstddef>
#include <iosfwd>
#include <memory>
#include "ntcore.h"
@@ -40,9 +41,10 @@ private:
class Storage {
public:
static Storage& GetInstance() {
if (!m_instance) m_instance = new Storage;
if (!m_instance) m_instance.reset(new Storage);
return *m_instance;
}
~Storage();
typedef llvm::StringMap<StorageEntry> EntriesMap;
@@ -55,13 +57,12 @@ class Storage {
private:
Storage();
~Storage();
Storage(const Storage&) = delete;
Storage& operator=(const Storage&) = delete;
EntriesMap m_entries;
static Storage* m_instance;
static std::unique_ptr<Storage> m_instance;
};
} // namespace ntimpl