diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 19:58:43 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-04 19:58:43 -0400 | 
| commit | 50a97cd15a4c290bd26729f2c8a498bb1d0178d8 (patch) | |
| tree | 247365c2de7ccd0bc70a39b6a70112ac881988c5 /indra/llcommon/tests | |
| parent | 99aa00293b1d79eb47cfe2caa85a5740a2959297 (diff) | |
| parent | 1d2514956f15f780aaead9bc123c1353a5b7fd20 (diff) | |
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/llcommon/tests')
| -rwxr-xr-x | indra/llcommon/tests/lleventcoro_test.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index da927038ab..79bcfe58ed 100755 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -86,6 +86,8 @@  #include "lleventcoro.h"  #include "../test/debug.h" +using namespace llcoro; +  /*****************************************************************************  *   from the banana.cpp example program borrowed for test<1>()  *****************************************************************************/ @@ -259,8 +261,7 @@ namespace tut          // Construct the coroutine instance that will run explicit_wait.          // Pass the ctor a callable that accepts the coroutine_type::self          // param passed by the library. -        boost::dcoroutines::coroutine<void()> -        coro(explicit_wait); +        boost::dcoroutines::coroutine<void()> coro(explicit_wait);          // Start the coroutine          coro(std::nothrow);          // When the coroutine waits for the event pump, it returns here. | 
