diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-02-14 13:53:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 13:53:27 -0800 |
| commit | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (patch) | |
| tree | 930755196559c57b629eee54129774edc7e2bfe5 /indra/llcommon/tests | |
| parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) | |
| parent | 3c719cc980c942bc54c6591e33a512562aa92a8b (diff) | |
Merge pull request #82 from KittyBarnett/xcode-14.1
Xcode 14.1
Diffstat (limited to 'indra/llcommon/tests')
| -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(); |