diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-05 01:05:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 01:05:08 +0200 |
commit | 25251c3ba81629f3234fc94c0368cd6300732b09 (patch) | |
tree | 03ababecc49376c0e607b3548d9beb596f79c3a7 /indra/llcommon/llsingleton.h | |
parent | d47c6536820d1ed6e373147678dd0fab90e80ab8 (diff) | |
parent | b68a05e7c30930976ed1273b4c7a0fec01d2a84f (diff) |
Merge pull request #924 from secondlife/marchcat/x-merge
Emoji -> Maint X merge
Diffstat (limited to 'indra/llcommon/llsingleton.h')
-rw-r--r-- | 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 51ef514cf7..cbe5ab6406 100644 --- a/indra/llcommon/llsingleton.h +++ b/indra/llcommon/llsingleton.h @@ -802,7 +802,7 @@ public: private: \ /* implement LLSingleton pure virtual method whose sole purpose */ \ /* is to remind people to use this macro */ \ - virtual void you_must_use_LLSINGLETON_macro() {} \ + virtual void you_must_use_LLSINGLETON_macro() override {} \ friend class LLSingleton<DERIVED_CLASS>; \ DERIVED_CLASS(__VA_ARGS__) |