diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-31 14:46:03 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-31 14:46:03 -0400 |
| commit | 3e1589709ff005822ddf2c17558b4195fa5e5c81 (patch) | |
| tree | a67ec5a99b79426aefd9bc0134ed583c54b54421 /indra | |
| parent | f5ccfff54299becdbff81661622375d319e5ea7b (diff) | |
MAINT-5232: LLMetricPerformanceTesterBasic::cleanClass->cleanupClass
for consistency with everything else, so we can use SUBSYSTEM_CLEANUP() macro
to call it.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llmetricperformancetester.cpp | 2 | ||||
| -rw-r--r-- | indra/llcommon/llmetricperformancetester.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llmetricperformancetester.cpp b/indra/llcommon/llmetricperformancetester.cpp index 1fc821d9a9..16fc365da1 100644 --- a/indra/llcommon/llmetricperformancetester.cpp +++ b/indra/llcommon/llmetricperformancetester.cpp @@ -40,7 +40,7 @@ LLMetricPerformanceTesterBasic::name_tester_map_t LLMetricPerformanceTesterBasic::sTesterMap ; /*static*/ -void LLMetricPerformanceTesterBasic::cleanClass() +void LLMetricPerformanceTesterBasic::cleanupClass() { for (name_tester_map_t::iterator iter = sTesterMap.begin() ; iter != sTesterMap.end() ; ++iter) { diff --git a/indra/llcommon/llmetricperformancetester.h b/indra/llcommon/llmetricperformancetester.h index 1a18cdf36f..e6b46be1cf 100644 --- a/indra/llcommon/llmetricperformancetester.h +++ b/indra/llcommon/llmetricperformancetester.h @@ -156,7 +156,7 @@ public: /** * @brief Delete all testers and reset the tester map */ - static void cleanClass() ; + static void cleanupClass() ; private: // Add a tester to the map. Returns false if adding fails. diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index fad9feee06..63e9788c6f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2027,7 +2027,7 @@ bool LLAppViewer::cleanup() gDirUtilp->getExpandedFilename(LL_PATH_LOGS, report_name)); } - LLMetricPerformanceTesterBasic::cleanClass() ; + SUBSYSTEM_CLEANUP(LLMetricPerformanceTesterBasic) ; LL_INFOS() << "Cleaning up Media and Textures" << LL_ENDL; |