diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-07 09:33:32 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-07 09:33:32 -0400 |
commit | 33007699cc701baf0c312ff669e659d874f3ae2f (patch) | |
tree | 9168a3a1ebfbcad3fabe10cae3ca2a36f6375e47 | |
parent | 0b9a641b17be2a22e2a274ce6ab18a84612454af (diff) | |
parent | 8487a19df1df6e9c279358a8694a729511f6dd85 (diff) |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-selfless
-rwxr-xr-x | indra/llcommon/tests/lleventcoro_test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcommon/tests/lleventcoro_test.cpp b/indra/llcommon/tests/lleventcoro_test.cpp index 9e2bc0acee..00be5035f2 100755 --- a/indra/llcommon/tests/lleventcoro_test.cpp +++ b/indra/llcommon/tests/lleventcoro_test.cpp @@ -65,12 +65,14 @@ // Boost.Coroutine #include is the *first* #include of the platform header. // That means that client code must generally #include Boost.Coroutine headers // before anything else. +#define BOOST_RESULT_OF_USE_TR1 1 #include <boost/dcoroutine/coroutine.hpp> // Normally, lleventcoro.h obviates future.hpp. We only include this because // we implement a "by hand" test of future functionality. #include <boost/dcoroutine/future.hpp> #include <boost/bind.hpp> #include <boost/range.hpp> +#include <boost/utility.hpp> #include "linden_common.h" |