From 7d860cc7cd615df4c1bf9f8039aa0ad1c3f5599a Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Thu, 10 Nov 2016 16:13:22 +0100 Subject: [PATCH] fixed eriks bug, must initialize const double values inside cpp not in h from gccc 4.4.6 onwards --- slsDetectorGui/include/qDrawPlot.h | 7 ++----- slsDetectorGui/src/qDrawPlot.cpp | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/slsDetectorGui/include/qDrawPlot.h b/slsDetectorGui/include/qDrawPlot.h index 7aab77331..a600acee4 100644 --- a/slsDetectorGui/include/qDrawPlot.h +++ b/slsDetectorGui/include/qDrawPlot.h @@ -479,11 +479,8 @@ double XYRangeValues[4]; bool IsXYRange[4]; /** Default timer between plots*/ -//#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6) -//static constexpr double PLOT_TIMER_MS = 200; -//#else -static const double PLOT_TIMER_MS = 200; -//#endif +static const double PLOT_TIMER_MS; + /** Specific timer value between plots */ double timerValue; /** every nth frame when to plot */ diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp index 0a23ccdb3..2284593cf 100644 --- a/slsDetectorGui/src/qDrawPlot.cpp +++ b/slsDetectorGui/src/qDrawPlot.cpp @@ -30,6 +30,7 @@ using namespace std; //------------------------------------------------------------------------------------------------------------------------------------------------- +const double qDrawPlot::PLOT_TIMER_MS = 200; qDrawPlot::qDrawPlot(QWidget *parent,multiSlsDetector*& detector): QWidget(parent),myDet(detector),plot1D_hists(0){