diff options
author | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2014-02-19 12:32:08 -0800 |
commit | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (patch) | |
tree | ff387e884e25eaa8a47adff4110ce02edfe67387 /indra/llcommon/tests/lleventcoro_test.cpp | |
parent | ce7e19d33a74e89059c2196da9c439d0eb9b21c1 (diff) | |
parent | 6661628d5c68855ddffc54a3f2578f93ada84de1 (diff) |
Merge with release
Diffstat (limited to 'indra/llcommon/tests/lleventcoro_test.cpp')
-rwxr-xr-x | indra/llcommon/tests/lleventcoro_test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index 5ebde1a31d..cb5e15eff2 100755 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -346,13 +346,13 @@ namespace tut LLCoroEventPumps waiter; replyName = waiter.getName0(); errorName = waiter.getName1(); - WrapLL_ERRS capture; + WrapLLErrs capture; try { result = waiter.waitWithLog(self); debug("no exception"); } - catch (const WrapLL_ERRS::FatalException& e) + catch (const WrapLLErrs::FatalException& e) { debug(STRINGIZE("exception " << e.what())); threw = e.what(); @@ -436,7 +436,7 @@ namespace tut BEGIN { LLCoroEventPumps waiter; - WrapLL_ERRS capture; + WrapLLErrs capture; try { result = waiter.postAndWaitWithLog(self, @@ -444,7 +444,7 @@ namespace tut immediateAPI.getPump(), "reply", "error"); debug("no exception"); } - catch (const WrapLL_ERRS::FatalException& e) + catch (const WrapLLErrs::FatalException& e) { debug(STRINGIZE("exception " << e.what())); threw = e.what(); |