X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fsession.cpp;h=f65b05a1588cad8ea001d31fdcdd3df7e6e94eca;hb=0402d7a3e425c56321234e4bb546d9b698c6d237;hp=a1a078788c4e49631e7d00df1ab5e82646a6cbe3;hpb=12ea3616767553ee0a615f14bbcb8ec614589e34;p=pulseview.git diff --git a/pv/session.cpp b/pv/session.cpp index a1a0787..f65b05a 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -22,8 +22,6 @@ #define NOGDI #define NORESOURCE #endif -#include -#include #include @@ -62,10 +60,6 @@ #include #endif -using boost::shared_lock; -using boost::shared_mutex; -using boost::unique_lock; - using std::bad_alloc; using std::dynamic_pointer_cast; using std::find_if; @@ -81,7 +75,6 @@ using std::mutex; using std::pair; using std::recursive_mutex; using std::runtime_error; -using std::set; using std::shared_ptr; using std::string; using std::unordered_set; @@ -92,18 +85,13 @@ using sigrok::Channel; using sigrok::ConfigKey; using sigrok::DatafeedCallbackFunction; using sigrok::Error; -using sigrok::Header; using sigrok::InputFormat; using sigrok::Logic; using sigrok::Meta; -using sigrok::OutputFormat; using sigrok::Packet; -using sigrok::PacketPayload; using sigrok::Session; -using sigrok::SessionDevice; using Glib::VariantBase; -using Glib::Variant; namespace pv { Session::Session(DeviceManager &device_manager, QString name) : @@ -822,7 +810,7 @@ void Session::update_signals() } default: - assert(0); + assert(false); break; } } @@ -871,7 +859,7 @@ void Session::sample_thread_proc(function error_handler) // Confirm that SR_DF_END was received if (cur_logic_segment_) { qDebug("SR_DF_END was not received."); - assert(0); + assert(false); } // Optimize memory usage