Skip to content

Undefined state after Reset or Inject #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sp3EdeR wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Undefined state after Reset or Inject #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions include/singleton.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ struct Singleton
Instance(const Instance&) = delete;
~Instance()
{
// Destroys the locally-initialized instance. Injected ones are ignored (no ownership).
if (m_pExtern == LOCAL_INSTANCE_ID)
GetBuffer().~T();
DestroyLocalInstance();
}
Instance& operator =(const Instance&) = delete;
/// Returns the current instance.
Expand All @@ -91,7 +89,7 @@ struct Singleton
template <typename ...Args>
void Emplace(Args&&... args)
{
this->~Instance();
DestroyLocalInstance();
try
{
new (&GetBuffer()) T(std::forward<Args>(args)...);
Expand All @@ -108,7 +106,7 @@ struct Singleton
*/
void SetExtern(T* ptr)
{
this->~Instance();
DestroyLocalInstance();
m_pExtern = ptr;
}
private:
Expand All @@ -123,6 +121,13 @@ struct Singleton
// Static, uninitialized buffer for the singleton's object
static union U { T asT; U(){} ~U(){} } buffer;
return buffer.asT;
}
/// Destroys the local instance, while ignoring injected ones (no ownership).
/** @remark This leaves the object in an inconsistent state. m_pExtern must be changed. */
void DestroyLocalInstance()
{
if (m_pExtern == LOCAL_INSTANCE_ID)
GetBuffer().~T();
}
} g_instance;

Expand Down