diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-25 16:07:27 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-25 16:07:27 -0400 |
| commit | 0727519d9307ed09877073ef17b754526ee3f5b1 (patch) | |
| tree | 9f769d7b5f326aaeb1c6810f7157b3040322017c | |
| parent | 0ea1b2a164e0d985c80c8a1afea4b31670efc907 (diff) | |
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.
| -rwxr-xr-x | indra/llcommon/llsingleton.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h index d66ea33c0c..25bdba0a0d 100755 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -67,7 +67,7 @@ protected: 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 |