diff options
| author | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
|---|---|---|
| committer | Michael West <michael.west@ettus.com> | 2013-12-06 17:47:24 -0800 |
| commit | c3aa7326095a1a8c744e269a04572de74600df8d (patch) | |
| tree | 983711ae9718128617b5f1880f8c6399e38e4055 /host/examples/network_relay.cpp | |
| parent | aa3d9a9da0405e84e720870a13718b177d85652c (diff) | |
| parent | 8f0f045cdac16ae84bc446b230beb2b651428294 (diff) | |
| download | uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.gz uhd-c3aa7326095a1a8c744e269a04572de74600df8d.tar.bz2 uhd-c3aa7326095a1a8c744e269a04572de74600df8d.zip | |
Merge branch 'master' into mwest_coverity
Conflicts:
host/lib/usrp/b200/b200_iface.cpp
Diffstat (limited to 'host/examples/network_relay.cpp')
| -rw-r--r-- | host/examples/network_relay.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp index fc1ebd91d..0a67bbf09 100644 --- a/host/examples/network_relay.cpp +++ b/host/examples/network_relay.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2012 Ettus Research LLC +// Copyright 2010-2013 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ #include <uhd/utils/thread_priority.hpp> #include <uhd/utils/safe_main.hpp> #include <boost/program_options.hpp> +#include <boost/thread/condition_variable.hpp> #include <boost/thread/thread.hpp> #include <boost/format.hpp> #include <boost/asio.hpp> |