diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
| commit | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (patch) | |
| tree | 5e509afd404c086e32ee4ba91b48118c0e3068f5 /indra/llcommon/tests/llsingleton_test.cpp | |
| parent | 7d1e3e08fcfbb3801edde3b6d248080055cd0a75 (diff) | |
| parent | 258c039584dd293ba7218dc522882bc0bac25e63 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
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(); |