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<Signal> > sigs(_view.session().get_signals());
    BOOST_FOREACH(const boost::shared_ptr<Signal> s, sigs) {
        assert(s);
-       shared_ptr<view::LogicSignal> logicSig;
+       boost::shared_ptr<view::LogicSignal> logicSig;
        if (logicSig = dynamic_pointer_cast<view::LogicSignal>(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);