diff --git a/Makefile b/Makefile index c2cfe0a79ccdf819f02daa4638821abc4b9d4992..c256d88c89f791b63cca210de44af079c26e62ac 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ # Version 1 - 2014-09-21, David Snider (sniderdj@umich.edu) # Vertion 0 - ????-??-??, Matt Diffenderfer (mjdiffy@umich.edu) -# enables c++11 on CAEN +# enables c++14 on CAEN PATH := /usr/um/gcc-5.1.0/bin:$(PATH) LD_LIBRARY_PATH := /usr/um/gcc-5.1.0/lib64 LD_RUN_PATH := /usr/um/gcc-5.1.0/lib64 @@ -87,7 +87,7 @@ PARTIAL_SUBMITFILE = partialsubmit.tar.gz FULL_SUBMITFILE = fullsubmit.tar.gz #Default Flags -CXXFLAGS = -std=c++11 -Wconversion -Wall -Werror -Wextra -pedantic +CXXFLAGS = -std=c++14 -Wconversion -Wall -Werror -Wextra -pedantic # make release - will compile "all" with $(CXXFLAGS) and the -O3 flag # also defines NDEBUG so that asserts will not check