diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-09-30 09:36:22 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-09-30 09:36:22 -0700 |
| commit | c581a9122062f3addd90eff93fdd6f59a7a350fd (patch) | |
| tree | 082a2d78492a720108b28fe25aed8192ce3dc812 /host/lib/utils | |
| parent | 994e993893d921c074ce4097632f8fa5bdecff66 (diff) | |
| parent | c6c2f14d849be4093f7b1fb1ed7235e189c43f48 (diff) | |
| download | uhd-c581a9122062f3addd90eff93fdd6f59a7a350fd.tar.gz uhd-c581a9122062f3addd90eff93fdd6f59a7a350fd.tar.bz2 uhd-c581a9122062f3addd90eff93fdd6f59a7a350fd.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/utils')
| -rw-r--r-- | host/lib/utils/log.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp index 123b7e4e6..8d42af9c4 100644 --- a/host/lib/utils/log.cpp +++ b/host/lib/utils/log.cpp @@ -23,7 +23,7 @@ #include <boost/format.hpp> #include <boost/thread/mutex.hpp> #include <boost/date_time/posix_time/posix_time.hpp> -#include <boost/thread/lock_guard.hpp> +#include <boost/thread/locks.hpp> #ifdef BOOST_MSVC //whoops! https://svn.boost.org/trac/boost/ticket/5287 //enjoy this useless dummy class instead |