diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2016-03-11 07:14:12 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-03-11 09:47:00 -0800 |
| commit | b634fbcfa14ee9ab81ffd458581ece3a4834002b (patch) | |
| tree | ad994fdcff750da6192cc9a8b31e535f4ee63a8e /host/lib/utils/log.cpp | |
| parent | 94230735279c721424ef001a799c780dc937a091 (diff) | |
| download | uhd-b634fbcfa14ee9ab81ffd458581ece3a4834002b.tar.gz uhd-b634fbcfa14ee9ab81ffd458581ece3a4834002b.tar.bz2 uhd-b634fbcfa14ee9ab81ffd458581ece3a4834002b.zip | |
log: remove MSVC 2010 Boost bug workaround
Diffstat (limited to 'host/lib/utils/log.cpp')
| -rw-r--r-- | host/lib/utils/log.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/host/lib/utils/log.cpp b/host/lib/utils/log.cpp index 8d42af9c4..4e58ce894 100644 --- a/host/lib/utils/log.cpp +++ b/host/lib/utils/log.cpp @@ -1,5 +1,5 @@ // -// Copyright 2012,2014 Ettus Research LLC +// Copyright 2012,2014,2016 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 @@ -24,19 +24,7 @@ #include <boost/thread/mutex.hpp> #include <boost/date_time/posix_time/posix_time.hpp> #include <boost/thread/locks.hpp> -#ifdef BOOST_MSVC -//whoops! https://svn.boost.org/trac/boost/ticket/5287 -//enjoy this useless dummy class instead -namespace boost{ namespace interprocess{ - struct file_lock{ - file_lock(const char * = NULL){} - void lock(void){} - void unlock(void){} - }; -}} //namespace -#else #include <boost/interprocess/sync/file_lock.hpp> -#endif #include <fstream> #include <cctype> |