From 833757ee836984f087faa42b88ae309b7c81cbbe Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 14 Nov 2016 15:01:43 +0000 Subject: [PATCH] ide: INITIALIZER removed from Browser for Functions4U compatibility git-svn-id: svn://ultimatepp.org/upp/trunk@10437 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/Browser/Base.cpp | 5 +++++ uppsrc/ide/Browser/Browser.h | 2 -- uppsrc/ide/Browser/TopicI.cpp | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp index f1d8d8bbe..13d40d367 100644 --- a/uppsrc/ide/Browser/Base.cpp +++ b/uppsrc/ide/Browser/Base.cpp @@ -20,6 +20,11 @@ #define CPP_CODEBASE_VERSION 3141592 +INITBLOCK { // Ugly as hell, but Functions4U are broken, so require this initialization hack instead of INITIALIZER + void InitializeTopicModule(); + InitializeTopicModule(); +} + ArrayMap source_file; void SourceFileInfo::Serialize(Stream& s) diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h index 21b54c075..9dd9de9e4 100644 --- a/uppsrc/ide/Browser/Browser.h +++ b/uppsrc/ide/Browser/Browser.h @@ -14,8 +14,6 @@ #define IMAGEFILE #include -INITIALIZE(TopicModule) - class Browser; CppBase& CodeBase(); diff --git a/uppsrc/ide/Browser/TopicI.cpp b/uppsrc/ide/Browser/TopicI.cpp index eecf301b4..ca538bd61 100644 --- a/uppsrc/ide/Browser/TopicI.cpp +++ b/uppsrc/ide/Browser/TopicI.cpp @@ -25,7 +25,7 @@ struct TopicModule : public IdeModule { } }; -INITIALIZER(TopicModule) +void InitializeTopicModule() { RegisterIdeModule(Single()); -} +} \ No newline at end of file