From e3ce47363990e94e7a895ac2a62a4d63ede020b7 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 8 Oct 2013 02:06:28 +0200 Subject: [PATCH] Compiler warning fix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit My guess is that this fixes the warning: /singularity/singularity-master/indra/newview/llfloaterdirectory.cpp: In function ‘void* createWebPanel(void*)’: /singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167: warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with greater visibility than the type of its field ‘createWebPanel(void*)::LLPanelDirWeb::’ /singularity/singularity-master/indra/newview/llfloaterdirectory.cpp:167: warning: ‘createWebPanel(void*)::LLPanelDirWeb’ declared with greater visibility than its base ‘LLPanelDirFind’ That I see in https://files.streamgrid.net/singularity/linux-i686.log --- indra/newview/llfloaterdirectory.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp index 92daa4e2b..64f721dd3 100644 --- a/indra/newview/llfloaterdirectory.cpp +++ b/indra/newview/llfloaterdirectory.cpp @@ -161,7 +161,9 @@ private: std::string mMarketplaceURL; }; -static void* createWebPanel(void* data) +namespace { + +void* createWebPanel(void* data) { struct LLPanelDirWeb : public LLPanelDirFind { @@ -175,6 +177,8 @@ static void* createWebPanel(void* data) return new LLPanelDirWeb(static_cast(data)); } +} // namespace + LLFloaterDirectory* LLFloaterDirectory::sInstance = NULL; //static S32 LLFloaterDirectory::sOldSearchCount = 0; // debug