From 0727519d9307ed09877073ef17b754526ee3f5b1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 25 Jun 2015 16:07:27 -0400
Subject: [PATCH] MAINT-5232: Correct forward declaration of
LLSingleton_manage_master. The forward declaration said it was a 'friend
class', whereas the actual definition is a struct. MSVC dislikes that.
---
indra/llcommon/llsingleton.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
index d66ea33c0c0..25bdba0a0d8 100755
--- a/indra/llcommon/llsingleton.h
+++ b/indra/llcommon/llsingleton.h
@@ -67,7 +67,7 @@ class LLSingletonBase: private boost::noncopyable
void add_master();
void remove_master();
// with a little help from our friends.
- template <class T> friend class LLSingleton_manage_master;
+ template <class T> friend struct LLSingleton_manage_master;
// Maintain a stack of the LLSingleton subclass instance currently being
// initialized. We use this to notice direct dependencies: we want to know
--
GitLab