Merge branch '17451k-master'

Author: eunovm

Dockerfile

@@ -10,7 +10,7 @@ RUN apt-get update && \
 RUN pip3 install pytest
 
 # Copy CIF source code
-COPY cif.c Makefile $CIF_SRC
+COPY cif.cpp Makefile $CIF_SRC
 COPY aspectator $CIF_SRC/aspectator
 COPY .git $CIF_SRC/.git
 COPY tests $CIF_SRC/tests

Dockerfile.cross

@@ -30,7 +30,7 @@ RUN ./configure --enable-local
 RUN make
 
 # Copy CIF source code
-COPY --chown=builduser:builduser cif.c Makefile $CIF_SRC
+COPY --chown=builduser:builduser cif.cpp Makefile $CIF_SRC
 COPY --chown=builduser:builduser aspectator $CIF_SRC/aspectator
 COPY --chown=builduser:builduser .git $CIF_SRC/.git
 COPY --chown=builduser:builduser tests $CIF_SRC/tests

Makefile

@@ -39,7 +39,7 @@ all:
 cif:
 	mkdir -p build
 	# You need to add option "-g" below to get a debug version of CIF.
-	gcc -D CIF_VERSION=\"$(CIF_VERSION)\" -Wall -Werror -O2 cif.c -o build/cif
+	g++ -D CIF_VERSION=\"$(CIF_VERSION)\" -Wall -Werror -O2 --std=c++17 cif.cpp -o build/cif
 
 build/install: uninstall install-keep-previous-instances