diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-10-07 15:16:07 +0200 |
|---|---|---|
| committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-10-08 14:01:05 +0200 |
| commit | e7f1466a7b7a26ab7e3ff113a85e2b533f6ee941 (patch) | |
| tree | ed709498a0fba4d9c04dbd61fc73466b5a535bf0 /indra/llcommon/tests/llsingleton_test.cpp | |
| parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
| parent | 13fe9744d7fb005ec37c05eae70e9bb2c518cb88 (diff) | |
Merge branch main into DRTVWR-489
Diffstat (limited to 'indra/llcommon/tests/llsingleton_test.cpp')
| -rw-r--r-- | indra/llcommon/tests/llsingleton_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/tests/llsingleton_test.cpp b/indra/llcommon/tests/llsingleton_test.cpp index 15ffe68e67..6f8aaaa0cb 100644 --- a/indra/llcommon/tests/llsingleton_test.cpp +++ b/indra/llcommon/tests/llsingleton_test.cpp @@ -47,8 +47,8 @@ public: \ DEP_INIT /* dependency in initSingleton */ \ } sDepFlag; \ \ - void initSingleton(); \ - void cleanupSingleton(); \ + void initSingleton() override; \ + void cleanupSingleton() override; \ }; \ \ CLS::dep_flag CLS::sDepFlag = DEP_NONE @@ -300,7 +300,7 @@ namespace tut { LLSINGLETON_EMPTY_CTOR(CircularPInit); public: - virtual void initSingleton() + virtual void initSingleton() override { // never mind indirection, just go straight for the circularity CircularPInit *pt = getInstance(); |