diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-12 21:14:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 21:14:45 +0200 |
| commit | 6b285674bba145dd70b90a06248ba8dd7fdc474a (patch) | |
| tree | 110015e1703b331715fbf7fb1a01639c74c47e62 /indra/llcommon/tests/llsingleton_test.cpp | |
| parent | 748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff) | |
| parent | eb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff) | |
Merge main into DRTVWR-600-maint-A
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(); |