diff --git a/src/mirage_widget/src/window/mwindow.cpp b/src/mirage_widget/src/window/mwindow.cpp index 9b17342..aa138dc 100644 --- a/src/mirage_widget/src/window/mwindow.cpp +++ b/src/mirage_widget/src/window/mwindow.cpp @@ -6,10 +6,6 @@ #include "mwindow_impl.cpp" -// 静态成员初始化 -std::vector> mwindow::windows_; - - struct mwindow_make_shared_enabler : public mwindow { mwindow_make_shared_enabler(const Eigen::Vector2i& in_size, const std::wstring& in_title) : mwindow(in_size.x(), in_size.y(), in_title.c_str()) {} diff --git a/src/mirage_widget/src/window/mwindow.h b/src/mirage_widget/src/window/mwindow.h index 1f0f2a2..5219c91 100644 --- a/src/mirage_widget/src/window/mwindow.h +++ b/src/mirage_widget/src/window/mwindow.h @@ -195,5 +195,5 @@ private: std::unique_ptr pimpl_; // 静态窗口集合,使用弱引用管理 - static std::vector> windows_; + inline static std::vector> windows_; };