summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/wrapllerrs.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llcommon/tests/wrapllerrs.h')
-rw-r--r--indra/llcommon/tests/wrapllerrs.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llcommon/tests/wrapllerrs.h b/indra/llcommon/tests/wrapllerrs.h
index 08fbf19b1c..3fb79f6b5d 100644
--- a/indra/llcommon/tests/wrapllerrs.h
+++ b/indra/llcommon/tests/wrapllerrs.h
@@ -37,6 +37,7 @@
#include "llerrorcontrol.h"
#include "llexception.h"
#include "stringize.h"
+#include "../test/catch_and_store_what_in.h"
#include <boost/bind.hpp>
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
@@ -86,6 +87,13 @@ struct WrapLLErrs
LLError::FatalFunction mPriorFatal;
};
+/// Convenience wrapper for catch_what<WrapLLErrs::FatalException>()
+template <typename FUNC>
+std::string catch_llerrs(FUNC func)
+{
+ return catch_what<WrapLLErrs::FatalException>(func);
+}
+
/**
* Capture log messages. This is adapted (simplified) from the one in
* llerror_test.cpp.