AvstpWrapper: try another singleton implementation

Try to force VC to call the constructor earlier (i.e. at DLL load time). Updates #1. Signed-off-by: akarin <[email protected]>
AmusementClub · May 22, 2021 · ac42d7e · ac42d7e
1 parent b5fd4f2
commit ac42d7e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/AvstpWrapper.cpp b/src/AvstpWrapper.cpp
@@ -82,10 +82,9 @@ Name: use_instance
 ==============================================================================
 */
 
+AvstpWrapper AvstpWrapper::instance;
 AvstpWrapper &	AvstpWrapper::use_instance ()
 {
-	static AvstpWrapper instance;
-
 	return (instance);
 }
 

diff --git a/src/AvstpWrapper.h b/src/AvstpWrapper.h
@@ -114,6 +114,7 @@ class AvstpWrapper
 	bool           operator == (const AvstpWrapper &other) const;
 	bool           operator != (const AvstpWrapper &other) const;
 
+	static AvstpWrapper instance;
 };	// class AvstpWrapper