From d2477cc8f0e1d3dc7479777ef94f9f3a022683f5 Mon Sep 17 00:00:00 2001 From: "Diego F. Asanza" Date: Sun, 19 Apr 2015 01:49:22 +0200 Subject: [PATCH] fix stdc++11 compilation issues --- DSView/pv/view/viewport.cpp | 2 +- DSView/pv/view/viewport.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp index d1579227..11bc42f1 100644 --- a/DSView/pv/view/viewport.cpp +++ b/DSView/pv/view/viewport.cpp @@ -503,7 +503,7 @@ void Viewport::measure() const vector< boost::shared_ptr > sigs(_view.session().get_signals()); BOOST_FOREACH(const boost::shared_ptr s, sigs) { assert(s); - shared_ptr logicSig; + boost::shared_ptr logicSig; if (logicSig = dynamic_pointer_cast(s)) { if (logicSig->measure(_view.hover_point(), _cur_sample, _nxt_sample, _thd_sample)) { _measure_shown = true; diff --git a/DSView/pv/view/viewport.h b/DSView/pv/view/viewport.h index e0dccb71..ae43c0e2 100644 --- a/DSView/pv/view/viewport.h +++ b/DSView/pv/view/viewport.h @@ -47,7 +47,7 @@ class Viewport : public QWidget public: static const int HitCursorMargin = 10; - static constexpr double HitCursorTimeMargin; + static const double HitCursorTimeMargin; public: explicit Viewport(View &parent);