diff options
author | Brad Linden <brad@lindenlab.com> | 2023-10-25 13:22:13 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2023-10-25 16:12:13 -0700 |
commit | 673b3309dde153fdadf7559bd16a5bb6db4723a1 (patch) | |
tree | 726d5e38b016d1d5504c3024b0959cec00d6c9c1 /indra/test/test.cpp | |
parent | 887226c7d2462306191126cc5bfc0de96e18ad42 (diff) | |
parent | e4d6a08941f9c4e81bda8ae14d481be5029353fd (diff) |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/test/test.cpp')
-rw-r--r-- | indra/test/test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/test/test.cpp b/indra/test/test.cpp index 28f25087ac..4987cf4727 100644 --- a/indra/test/test.cpp +++ b/indra/test/test.cpp @@ -97,10 +97,10 @@ public: class RecordToTempFile : public LLError::Recorder, public boost::noncopyable { public: - RecordToTempFile(apr_pool_t* pPool) + RecordToTempFile() : LLError::Recorder(), boost::noncopyable(), - mTempFile("log", "", pPool), + mTempFile("log", ""), mFile(mTempFile.getName().c_str()) { } @@ -141,11 +141,11 @@ private: class LLReplayLogReal: public LLReplayLog, public boost::noncopyable { public: - LLReplayLogReal(LLError::ELevel level, apr_pool_t* pool) + LLReplayLogReal(LLError::ELevel level) : LLReplayLog(), boost::noncopyable(), mOldSettings(LLError::saveAndResetSettings()), - mRecorder(new RecordToTempFile(pool)) + mRecorder(new RecordToTempFile()) { LLError::setFatalFunction(wouldHaveCrashed); LLError::setDefaultLevel(level); @@ -624,7 +624,7 @@ int main(int argc, char **argv) if (LOGFAIL && *LOGFAIL) { LLError::ELevel level = LLError::decodeLevel(LOGFAIL); - replayer.reset(new LLReplayLogReal(level, gAPRPoolp)); + replayer.reset(new LLReplayLogReal(level)); } } LLError::setFatalFunction(wouldHaveCrashed); |