diff options
| author | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-12-22 10:30:36 +0000 |
| commit | 3cb623b07e50d9e95dace9966dc0337e72f57dc2 (patch) | |
| tree | dfe994f28f0a6dee6151febf3b50f22adceab74e /src/core/GpgFunctionObject.h | |
| parent | Merge pull request #70 from saturneric/dev/2.0.8/saturneric (diff) | |
| parent | fix: continue to solve ubuntu 18.04 build issues (diff) | |
| download | GpgFrontend-2.0.10.tar.gz GpgFrontend-2.0.10.zip | |
fix: solve conflictsv2.0.10
Diffstat (limited to '')
| -rw-r--r-- | src/core/GpgFunctionObject.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/GpgFunctionObject.h b/src/core/GpgFunctionObject.h index de27ea42..56d0ab22 100644 --- a/src/core/GpgFunctionObject.h +++ b/src/core/GpgFunctionObject.h @@ -125,7 +125,7 @@ class GPGFRONTEND_CORE_EXPORT SingletonStorageCollection { * * @return SingletonStorageCollection* */ - static SingletonStorageCollection* GetInstance(); + static SingletonStorageCollection* GetInstance(bool force_refresh); /** * @brief Get the Singleton Storage object @@ -173,7 +173,7 @@ class SingletonFunctionObject : public ChannelObject { "T not derived from SingletonFunctionObject<T>"); auto p_storage = - SingletonStorageCollection::GetInstance()->GetSingletonStorage( + SingletonStorageCollection::GetInstance(false)->GetSingletonStorage( typeid(T)); auto* _p_pbj = (T*)(p_storage->FindObjectInChannel(channel)); @@ -200,7 +200,7 @@ class SingletonFunctionObject : public ChannelObject { "T not derived from SingletonFunctionObject<T>"); auto p_storage = - SingletonStorageCollection::GetInstance()->GetSingletonStorage( + SingletonStorageCollection::GetInstance(false)->GetSingletonStorage( typeid(T)); auto _p_pbj = (T*)(p_storage->FindObjectInChannel(channel)); @@ -219,7 +219,7 @@ class SingletonFunctionObject : public ChannelObject { * @return T& */ static void ReleaseChannel(int channel) { - SingletonStorageCollection::GetInstance() + SingletonStorageCollection::GetInstance(false) ->GetSingletonStorage(typeid(T)) ->ReleaseChannel(channel); } @@ -244,7 +244,7 @@ class SingletonFunctionObject : public ChannelObject { * @return std::vector<int> */ static std::vector<int> GetAllChannelId() { - return SingletonStorageCollection::GetInstance() + return SingletonStorageCollection::GetInstance(false) ->GetSingletonStorage(typeid(T)) ->GetAllChannelId(); } |