some changes for qwt7 and for higher gcc

This commit is contained in:
Dhanya Maliakal 2016-11-10 14:56:52 +01:00
parent b55414cd38
commit fd666605aa
2 changed files with 5 additions and 5 deletions

View File

@ -479,11 +479,11 @@ 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
//#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6)
//static constexpr double PLOT_TIMER_MS = 200;
//#else
static const double PLOT_TIMER_MS = 200;
#endif
//#endif
/** Specific timer value between plots */
double timerValue;
/** every nth frame when to plot */

View File

@ -23,7 +23,7 @@ QMAKE_LIBS = -L$(QTDIR)/lib
DEFINES += VERBOSE DACS_INT PRINT_LOG #VERYVERBOSE CHECKINFERROR
LIBS = -L$(QWTDIR)/lib -lqwt -L$(QWT3D)/lib
CXXFLAGS += -g
CXXFLAGS += -std=c++11 -g
QMAKE_CXXFLAGS_WARN_ON = -w