Enforce cpp17 (#2006)

sharmeye · web-flow · commit 737fdbe0fba3 · 2025-12-15T11:40:53.000-06:00
* Updated makefiles

* fixed typo

* undo changes to test that snuck in

* Found more 11s and 14s lurking about
diff --git a/Makefile b/Makefile
@@ -13,6 +13,8 @@
 
 export TRICK_HOME = $(CURDIR)
 
+TRICK_CXXFLAGS += -std=c++17
+
 # Include the build configuration information.
 include $(TRICK_HOME)/share/trick/makefiles/Makefile.common
 
diff --git a/libexec/trick/make_makefile_swig b/libexec/trick/make_makefile_swig
@@ -32,7 +32,7 @@ sub read_files_to_process() {
 
     # Prepend -I to each include path before we pass them to the compiler
     my @include_paths = map("-I$_", (get_include_paths(), "$ENV{TRICK_HOME}/include", "$ENV{TRICK_HOME}/include/trick/compat", "$ENV{TRICK_HOME}/trick_source", "../include")) ;
-    my @defines = (get_defines(), "-DTRICK_VER=$year", "-DSWIG", "-std=c++11") ;
+    my @defines = (get_defines(), "-DTRICK_VER=$year", "-DSWIG") ;
 
     # get the list of header files from the compiler
     open FILE_LIST, "$cc -MM @include_paths @defines S_source.hh |" ;
diff --git a/share/trick/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib
@@ -94,7 +94,6 @@ $(TRICK_LIB_DIR):
 $(IO_C_OBJS): $(OBJ_DIR)/%.o : $(IO_SRC_DIR)%.c | $(OBJ_DIR)
 	$(TRICK_CC) $(TRICK_CFLAGS) $(TRICK_SYSTEM_CFLAGS) -c $< -o $@
 
-$(IO_CPP_OBJS): TRICK_SYSTEM_CXXFLAGS += -std=c++11
 $(IO_CPP_OBJS): TRICK_SYSTEM_CXXFLAGS += -Wno-invalid-offsetof
 ifeq ($(IS_CC_CLANG), 0)
  # cannot get an "expr" command to work on all platforms.  Falling back to reliable perl. :)
diff --git a/share/trick/makefiles/config_Linux.mk b/share/trick/makefiles/config_Linux.mk
@@ -65,5 +65,5 @@ ifeq "" "c++14"
 TRICK_ADDITIONAL_CXXFLAGS += -std=c++14 -D_HAVE_STL_RANDOM
 endif
 
-TRICK_ADDITIONAL_TEST_FLAGS += -std=c++14
+TRICK_ADDITIONAL_TEST_FLAGS += -std=c++17
 
diff --git a/share/trick/makefiles/trickify.mk b/share/trick/makefiles/trickify.mk
@@ -135,7 +135,7 @@ $(dir $(TRICKIFY_OBJECT_NAME)) $(BUILD_DIR) $(dir $(TRICKIFY_PYTHON_DIR)) .trick
 
 $(IO_OBJECTS): %.o: %.cpp
 	$(info $(call COLOR,Compiling)  $<)
-	$(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -std=c++11 -Wno-invalid-offsetof -MMD -MP -c -o $@ $<)
+	$(call ECHO_AND_LOG,$(TRICK_CXX) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -Wno-invalid-offsetof -MMD -MP -c -o $@ $<)
 
 $(IO_OBJECTS:.o=.d): %.d: ;
 
diff --git a/trick_source/data_products/makefile b/trick_source/data_products/makefile
@@ -4,8 +4,6 @@
 
 TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
 
-TRICK_CXXFLAGS += -std=c++11
-
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 LIB_DIR = lib_${TRICK_HOST_CPU}
diff --git a/trick_source/sim_services/DataRecord/Makefile b/trick_source/sim_services/DataRecord/Makefile
@@ -2,7 +2,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefi
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 
-TRICK_CXXFLAGS += -std=c++11
 
 ifneq ($(HDF5),)
 ifneq ($(HDF5),/usr)
diff --git a/trick_source/sim_services/Message/Makefile b/trick_source/sim_services/Message/Makefile
@@ -2,4 +2,3 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefi
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 
-TRICK_CXXFLAGS += -std=c++11
diff --git a/trick_source/sim_services/MonteCarlo/Makefile b/trick_source/sim_services/MonteCarlo/Makefile
@@ -3,7 +3,6 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 
 -include Makefile_deps
 
-TRICK_CXXFLAGS += -std=c++11
 
 ifeq ($(HAVE_GSL),1)
 TRICK_CXXFLAGS += -D_HAVE_GSL
diff --git a/trick_source/sim_services/MonteCarloGeneration/Makefile b/trick_source/sim_services/MonteCarloGeneration/Makefile
@@ -1,4 +1,3 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
-TRICK_CXXFLAGS += -std=c++11
 -include Makefile_deps
diff --git a/trick_source/sim_services/Sie/Makefile b/trick_source/sim_services/Sie/Makefile
@@ -2,4 +2,3 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefi
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 
-TRICK_CXXFLAGS += -std=c++11
diff --git a/trick_source/sim_services/ThreadBase/Makefile b/trick_source/sim_services/ThreadBase/Makefile
@@ -1,4 +1,3 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-TRICK_CXXFLAGS += -std=c++11
diff --git a/trick_source/sim_services/VariableServer/Makefile b/trick_source/sim_services/VariableServer/Makefile
@@ -1,4 +1,3 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-TRICK_CXXFLAGS += -std=c++11
diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile
@@ -25,7 +25,7 @@ PY_FILES = \
     ${TRICK_HOME}/share/trick/swig/swig_ref.py
 
 SWIG_SRC_FILES = $(addprefix swig_${TRICK_HOST_CPU}/, $(notdir $(subst .o,.cpp,$(SWIG_OBJECT_FILES))))
-TRICK_CXXFLAGS += $(PYTHON_INCLUDES) -Wno-redundant-decls -Wno-shadow -Wno-unused-parameter -Wno-missing-field-initializers -std=c++11
+TRICK_CXXFLAGS += $(PYTHON_INCLUDES) -Wno-redundant-decls -Wno-shadow -Wno-unused-parameter -Wno-missing-field-initializers 
 
 ifeq ($(IS_CC_CLANG), 1)
 TRICK_CXXFLAGS += -Wno-self-assign -Wno-sometimes-uninitialized
diff --git a/trick_source/trick_utils/SAIntegrator/makefile b/trick_source/trick_utils/SAIntegrator/makefile
@@ -3,7 +3,7 @@ RM = rm -rf
 CC = gcc
 CPP = c++
 
-CFLAGS = -g -Wall -std=c++11 ${TRICK_CXXFLAGS}
+CFLAGS = -g -Wall  ${TRICK_CXXFLAGS}
 INCLUDE_DIRS = -Iinclude
 OBJDIR = obj
 LIBDIR = lib
diff --git a/trick_source/trick_utils/connection_handlers/Makefile b/trick_source/trick_utils/connection_handlers/Makefile
@@ -9,7 +9,6 @@ TRICK_LIB := $(TRICK_LIB_DIR)/libtrick_connection_handlers.a
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 
-TRICK_CXXFLAGS += -std=c++11
 
 # make the comm library when called by the master makefile.
 trick: ${TRICK_LIB}
diff --git a/trick_source/trick_utils/var_binary_parser/Makefile b/trick_source/trick_utils/var_binary_parser/Makefile
@@ -6,7 +6,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
 
 #include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 
-CPP_FLAGS = -g -Wall -Wextra -std=c++11 $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS)
+CPP_FLAGS = -g -Wall -Wextra $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS)
 INCLUDE_DIRS = -I${TRICK_HOME}/include
 OBJDIR = obj
 LIBDIR = lib
diff --git a/trick_source/web/CivetServer/makefile b/trick_source/web/CivetServer/makefile
@@ -9,7 +9,7 @@ CP = cp
 MKDIR = mkdir
 
 CFLAGS = -g -Wall
-CPPFLAGS = -g -Wall -std=c++11
+CPPFLAGS = -g -Wall
 
 INCLUDE_DIRS = -I${PWD}/include -I${CIVETWEB_HOME}/include -I${TRICK_HOME}/include
 

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefi`
`2`	`2`	`include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib`
`3`	`3`	`-include Makefile_deps`
`4`	`4`
`5`		`-TRICK_CXXFLAGS += -std=c++11`