diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-03-02 08:55:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-03-02 08:55:04 +0800 |
| commit | 64a181fdde219328560eee0ff5b87f02ba36a65f (patch) | |
| tree | 285437f75513ef47639ee9f3f8d47a5dc1b0ef8c /indra/llcommon/tests/llsingleton_test.cpp | |
| parent | 60592ae0d7a98e071e516fcac70c5bf1427f20be (diff) | |
| parent | 1204468415dd5248bbd01d7aaede520ede3b9d36 (diff) | |
Merge tag '7.1.3-release'
source for viewer 7.1.3.7878383867
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(); |