From c45d5ada61ecdd0be0fda2c22023e0c2349059e1 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:15:45 +0200 Subject: [PATCH 01/10] [pumpstation] moved to -std=c++17 --- pumpstation/analysis/PumpStationAnalysis.pro.in | 2 +- pumpstation/app/CMSPumpStationControl.pro | 2 +- pumpstation/controller/PumpStationControl.pro.in | 2 +- pumpstation/daemon/DataLogger.h | 1 + pumpstation/daemon/PumpStationDaemon.pro.in | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pumpstation/analysis/PumpStationAnalysis.pro.in b/pumpstation/analysis/PumpStationAnalysis.pro.in index 8e44d7338..64252b97a 100644 --- a/pumpstation/analysis/PumpStationAnalysis.pro.in +++ b/pumpstation/analysis/PumpStationAnalysis.pro.in @@ -20,7 +20,7 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } diff --git a/pumpstation/app/CMSPumpStationControl.pro b/pumpstation/app/CMSPumpStationControl.pro index 5d30f1c33..ee72c4967 100644 --- a/pumpstation/app/CMSPumpStationControl.pro +++ b/pumpstation/app/CMSPumpStationControl.pro @@ -13,7 +13,7 @@ win32 { CONFIG += link_pkgconfig PKGCONFIG += -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 QT += core gui network script svg greaterThan(QT_MAJOR_VERSION, 4) { diff --git a/pumpstation/controller/PumpStationControl.pro.in b/pumpstation/controller/PumpStationControl.pro.in index 552ad8097..71280c7bb 100644 --- a/pumpstation/controller/PumpStationControl.pro.in +++ b/pumpstation/controller/PumpStationControl.pro.in @@ -17,7 +17,7 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } diff --git a/pumpstation/daemon/DataLogger.h b/pumpstation/daemon/DataLogger.h index 353df90db..e3f638f74 100644 --- a/pumpstation/daemon/DataLogger.h +++ b/pumpstation/daemon/DataLogger.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include diff --git a/pumpstation/daemon/PumpStationDaemon.pro.in b/pumpstation/daemon/PumpStationDaemon.pro.in index a85a9f2bb..c0ac1c429 100644 --- a/pumpstation/daemon/PumpStationDaemon.pro.in +++ b/pumpstation/daemon/PumpStationDaemon.pro.in @@ -21,7 +21,7 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } From 54810cf916e1923dfb9e04779c67bd0e04d4adb3 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:16:10 +0200 Subject: [PATCH 02/10] [tools] moved to -std=c++17 --- tools/ReadKeithley2700/Makefile.in | 2 +- tools/TkModLabRoot/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ReadKeithley2700/Makefile.in b/tools/ReadKeithley2700/Makefile.in index 32fa6f5b8..908b1808d 100644 --- a/tools/ReadKeithley2700/Makefile.in +++ b/tools/ReadKeithley2700/Makefile.in @@ -10,7 +10,7 @@ SOURCE = ReadKeithley2700 ARCHITECTURE := @architecture@ -CXXFLAGS = -Wall -fPIC -std=c++0x -I$(BASEPATH)/devices/Keithley +CXXFLAGS = -Wall -fPIC -std=c++17 -I$(BASEPATH)/devices/Keithley ifeq ($(USEFAKEDEVICES),1) CXXFLAGS += -DUSE_FAKEIO diff --git a/tools/TkModLabRoot/Makefile.in b/tools/TkModLabRoot/Makefile.in index f245405af..5dd9e96b8 100644 --- a/tools/TkModLabRoot/Makefile.in +++ b/tools/TkModLabRoot/Makefile.in @@ -34,7 +34,7 @@ endif CC = @cc@ CXX = @cxx@ -CXXFLAGS = -fPIC -std=c++11 +CXXFLAGS = -fPIC -std=c++17 LD = @cxx@ SOFLAGS = @soflags@ From 9c308d52a7a4a226be09acb72390273c7fea481d Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:17:05 +0200 Subject: [PATCH 03/10] [assembly] moved to -std=c++17 --- assembly/assembly/assembly.pro.in | 2 +- assembly/assemblyCommon/assemblyCommon.pro.in | 2 +- assembly/motion/motionCommander/motionCommander.pro.in | 2 +- assembly/testingArea/Testing/Testing.pro | 2 +- assembly/vision/circleCalibration/circleCalibration.pro.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assembly/assembly/assembly.pro.in b/assembly/assembly/assembly.pro.in index 000e55014..b375a7a9a 100644 --- a/assembly/assembly/assembly.pro.in +++ b/assembly/assembly/assembly.pro.in @@ -31,7 +31,7 @@ PKGCONFIG += opencv QMAKE = @qmake@ -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } diff --git a/assembly/assemblyCommon/assemblyCommon.pro.in b/assembly/assemblyCommon/assemblyCommon.pro.in index 079c57554..ac68cb824 100644 --- a/assembly/assemblyCommon/assemblyCommon.pro.in +++ b/assembly/assemblyCommon/assemblyCommon.pro.in @@ -38,7 +38,7 @@ PKGCONFIG += opencv QMAKE = @qmake@ -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" diff --git a/assembly/motion/motionCommander/motionCommander.pro.in b/assembly/motion/motionCommander/motionCommander.pro.in index 84519d50d..dc8f80cd6 100644 --- a/assembly/motion/motionCommander/motionCommander.pro.in +++ b/assembly/motion/motionCommander/motionCommander.pro.in @@ -38,7 +38,7 @@ PKGCONFIG += opencv QMAKE = @qmake@ -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } diff --git a/assembly/testingArea/Testing/Testing.pro b/assembly/testingArea/Testing/Testing.pro index 068f05b26..9ed409cc6 100644 --- a/assembly/testingArea/Testing/Testing.pro +++ b/assembly/testingArea/Testing/Testing.pro @@ -25,7 +25,7 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += opencv -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } diff --git a/assembly/vision/circleCalibration/circleCalibration.pro.in b/assembly/vision/circleCalibration/circleCalibration.pro.in index 3002e25bc..d9c0b445b 100644 --- a/assembly/vision/circleCalibration/circleCalibration.pro.in +++ b/assembly/vision/circleCalibration/circleCalibration.pro.in @@ -31,7 +31,7 @@ PKGCONFIG += opencv QMAKE = @qmake@ -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } From adfc5e7286fda19be83bdf67b183564ad4d90e0b Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:17:27 +0200 Subject: [PATCH 04/10] [common_test] moved to -std=c++17 --- common_test/common_test.pro.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common_test/common_test.pro.in b/common_test/common_test.pro.in index 791b81bdd..bfc326edf 100644 --- a/common_test/common_test.pro.in +++ b/common_test/common_test.pro.in @@ -22,8 +22,8 @@ macx { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11 } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { From 9367874e734ba0f5120b19e7aa85b235fd46f059 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:18:24 +0200 Subject: [PATCH 05/10] [defo] moved to -std=c++17 --- defo/defoCalib/defoCalib.pro.in | 4 ++-- defo/defoCommon/defoCommon.pro.in | 4 ++-- defo/defoDAQ/defoDAQ.pro.in | 4 ++-- defo/defoDAQ2Root/defoDAQ2Root.pro.in | 4 ++-- defo/defoDisplay/defoDisplay.pro.in | 4 ++-- defo/defoReco/defoReco.pro.in | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/defo/defoCalib/defoCalib.pro.in b/defo/defoCalib/defoCalib.pro.in index 1c474d719..7e7b9fbb2 100644 --- a/defo/defoCalib/defoCalib.pro.in +++ b/defo/defoCalib/defoCalib.pro.in @@ -29,8 +29,8 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += opencv exiv2 libgphoto2 -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/defo/defoCommon/defoCommon.pro.in b/defo/defoCommon/defoCommon.pro.in index eb8dbddba..e8477b31b 100644 --- a/defo/defoCommon/defoCommon.pro.in +++ b/defo/defoCommon/defoCommon.pro.in @@ -23,8 +23,8 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += opencv exiv2 libgphoto2 -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/defo/defoDAQ/defoDAQ.pro.in b/defo/defoDAQ/defoDAQ.pro.in index 5d4b75b2e..1a7b0b8e7 100644 --- a/defo/defoDAQ/defoDAQ.pro.in +++ b/defo/defoDAQ/defoDAQ.pro.in @@ -27,8 +27,8 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += opencv exiv2 libgphoto2 -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/defo/defoDAQ2Root/defoDAQ2Root.pro.in b/defo/defoDAQ2Root/defoDAQ2Root.pro.in index 29a759501..6ed4f1f8c 100644 --- a/defo/defoDAQ2Root/defoDAQ2Root.pro.in +++ b/defo/defoDAQ2Root/defoDAQ2Root.pro.in @@ -3,8 +3,8 @@ LIBS += @rootlibs@ QMAKE = @qmake@ -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/defo/defoDisplay/defoDisplay.pro.in b/defo/defoDisplay/defoDisplay.pro.in index d4d017c40..ffa100fdc 100644 --- a/defo/defoDisplay/defoDisplay.pro.in +++ b/defo/defoDisplay/defoDisplay.pro.in @@ -21,8 +21,8 @@ macx { LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/defo/defoReco/defoReco.pro.in b/defo/defoReco/defoReco.pro.in index 213ce3b93..e77d06f56 100644 --- a/defo/defoReco/defoReco.pro.in +++ b/defo/defoReco/defoReco.pro.in @@ -27,8 +27,8 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += opencv exiv2 libgphoto2 -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { From 00d458c5209b361f889994b794040e319669c2eb Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:18:38 +0200 Subject: [PATCH 06/10] [devices] moved to -std=c++17 --- devices/Makefile.common.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/Makefile.common.in b/devices/Makefile.common.in index f896b556e..b6f3904f5 100644 --- a/devices/Makefile.common.in +++ b/devices/Makefile.common.in @@ -1,6 +1,6 @@ CC = @cc@ CXX = @cxx@ -CXXFLAGS = -fPIC -std=c++11 +CXXFLAGS = -fPIC -std=c++17 LD = @cxx@ SOFLAGS = @soflags@ From 04d2aae2e8e291e82202539944d0a6992fe9ae62 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:18:59 +0200 Subject: [PATCH 07/10] [external] moved to -std=c++17 --- external/math/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/math/Makefile.in b/external/math/Makefile.in index 7f6daba4c..dc9bbfb2f 100644 --- a/external/math/Makefile.in +++ b/external/math/Makefile.in @@ -11,7 +11,7 @@ MODULES = TkMLVector \ CC = @cc@ CXX = @cxx@ -CXXFLAGS = -fPIC -std=c++11 -I. +CXXFLAGS = -fPIC -std=c++17 -I. LD = @cxx@ SOFLAGS = @soflags@ From 7faa3c2f565f6dfba5fc0f17139330e2794c6bf4 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:19:13 +0200 Subject: [PATCH 08/10] [plasma] moved to -std=c++17 --- plasma/plasmacleaner.pro.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plasma/plasmacleaner.pro.in b/plasma/plasmacleaner.pro.in index 41041ea05..55d209242 100644 --- a/plasma/plasmacleaner.pro.in +++ b/plasma/plasmacleaner.pro.in @@ -20,7 +20,7 @@ macx { CONFIG += link_pkgconfig PKGCONFIG += -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } From 257dfa559523d868d7819dd22615e9dbb1c156ab Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:19:24 +0200 Subject: [PATCH 09/10] [python] moved to -std=c++17 --- python/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/Makefile.in b/python/Makefile.in index 1830e1697..2be841146 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -12,7 +12,7 @@ PYTHONINC := $(shell python-config --cflags) CC = @cc@ CXX = @cxx@ -CXXFLAGS = -fPIC -std=c++11 +CXXFLAGS = -fPIC -std=c++17 LD = @cxx@ SOFLAGS = @soflags@ From 650470951d8aec9164f2b9670e5be6cbef55a614 Mon Sep 17 00:00:00 2001 From: Marino Missiroli Date: Fri, 14 Jun 2019 14:19:48 +0200 Subject: [PATCH 10/10] [thermo] moved to -std=c++17 --- thermo/microDAQ/microDAQ.pro.in | 4 ++-- thermo/microDisplay/microDisplay.pro.in | 4 ++-- thermo/thermoDAQ/thermoDAQ.pro.in | 4 ++-- thermo/thermoDAQ2Log/thermoDAQ2Log.pro.in | 4 ++-- thermo/thermoDAQ2Plots/thermoDAQ2Plots.pro.in | 4 ++-- thermo/thermoDAQ2Root/thermoDAQ2Root.pro.in | 4 ++-- thermo/thermoDisplay/thermoDisplay.pro.in | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/thermo/microDAQ/microDAQ.pro.in b/thermo/microDAQ/microDAQ.pro.in index 0d47a4128..babb957df 100644 --- a/thermo/microDAQ/microDAQ.pro.in +++ b/thermo/microDAQ/microDAQ.pro.in @@ -22,8 +22,8 @@ macx { #LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" diff --git a/thermo/microDisplay/microDisplay.pro.in b/thermo/microDisplay/microDisplay.pro.in index 416b6f1ed..fa3b04c7f 100644 --- a/thermo/microDisplay/microDisplay.pro.in +++ b/thermo/microDisplay/microDisplay.pro.in @@ -20,8 +20,8 @@ macx { #LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/thermo/thermoDAQ/thermoDAQ.pro.in b/thermo/thermoDAQ/thermoDAQ.pro.in index bbc8ccf41..96856f07c 100644 --- a/thermo/thermoDAQ/thermoDAQ.pro.in +++ b/thermo/thermoDAQ/thermoDAQ.pro.in @@ -20,8 +20,8 @@ macx { #LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" diff --git a/thermo/thermoDAQ2Log/thermoDAQ2Log.pro.in b/thermo/thermoDAQ2Log/thermoDAQ2Log.pro.in index 774851bfb..4c162da52 100644 --- a/thermo/thermoDAQ2Log/thermoDAQ2Log.pro.in +++ b/thermo/thermoDAQ2Log/thermoDAQ2Log.pro.in @@ -6,8 +6,8 @@ QMAKE = @qmake@ -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/thermo/thermoDAQ2Plots/thermoDAQ2Plots.pro.in b/thermo/thermoDAQ2Plots/thermoDAQ2Plots.pro.in index 0f88e4eed..5aeb7d166 100644 --- a/thermo/thermoDAQ2Plots/thermoDAQ2Plots.pro.in +++ b/thermo/thermoDAQ2Plots/thermoDAQ2Plots.pro.in @@ -20,8 +20,8 @@ macx { #LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/thermo/thermoDAQ2Root/thermoDAQ2Root.pro.in b/thermo/thermoDAQ2Root/thermoDAQ2Root.pro.in index 2b720b89b..015c8b000 100644 --- a/thermo/thermoDAQ2Root/thermoDAQ2Root.pro.in +++ b/thermo/thermoDAQ2Root/thermoDAQ2Root.pro.in @@ -9,8 +9,8 @@ LIBS += @rootlibs@ QMAKE = @qmake@ -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\" } else { diff --git a/thermo/thermoDisplay/thermoDisplay.pro.in b/thermo/thermoDisplay/thermoDisplay.pro.in index ef4fbdc39..cd30880b2 100644 --- a/thermo/thermoDisplay/thermoDisplay.pro.in +++ b/thermo/thermoDisplay/thermoDisplay.pro.in @@ -20,8 +20,8 @@ macx { #LIBS += -framework Cocoa } -CONFIG+=c++11 -QMAKE_CXXFLAGS += -std=c++11 +CONFIG+=c++17 +QMAKE_CXXFLAGS += -std=c++17 macx { QMAKE_CXXFLAGS += -DAPPLICATIONVERSIONSTR=\\\"unknown\\\"