Updated warped2-models to c++20 compliance.

README.md

@@ -1,6 +1,12 @@
 # WARPED Simulation Models
 Simulation models for the WARPED Parallel & Distributed Discrete Simulation Library
 
+# Prerequisite
+
+Before building this project, you need to have the following dependencies installed: libre2-dev.
+
+	sudo apt install libre2-dev
+
 # Building
 
 The WARPED models are built with a C++11 compiler (see [here](http://lektiondestages.blogspot.de/2013/05/installing-and-switching-gccg-versions.html) for instructions about upgrading and switching GCC versions if you have an old version of GCC that does not support the required features.).  

build.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# we want this script to fail on any error
+set -e
+cd ../ #go back one directory
+export CUR_LOC=`pwd`
+echo "Building warped2 and warped2-models at: " $CUR_LOC
+
+#
+# warped2
+#
+ARGS=$1
+
+echo "....warped2"
+date
+cd warped2
+autoreconf -i
+
+#
+# configure with openmpi 
+#
+export MPI_LOC=/usr/lib/x86_64-linux-gnu/openmpi/include
+
+# build warped2
+./configure --with-mpi-includedir=$MPI_LOC --prefix=$CUR_LOC/warped2/local CXXFLAGS='-g -O3' $1
+make -j 8 install
+date
+# return to original subdirectory
+cd $CUR_LOC
+
+#
+# warped2-models
+#
+
+echo "....warped2-models"
+date
+
+cd warped2-models
+autoreconf -i
+
+# build warped2-models
+./configure --with-warped=$CUR_LOC/warped2/local CXXFLAGS='-g -O3' CXX=mpicxx
+make -j 8
+date
+
+# return to original subdirectory
+cd $CUR_LOC
+

configure.ac

@@ -11,8 +11,9 @@ dnl Checks for programs.
 LT_INIT([disable-shared])
 AC_PROG_CXX
 
-m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
-AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
+dnl specify C++20 as desired version
+m4_include([m4/ax_cxx_compile_stdcxx.m4])
+AX_CXX_COMPILE_STDCXX(20,[noext], [mandatory])
 
 dnl Check for libwarped
 m4_include([m4/check_lib_warped.m4])
@@ -21,11 +22,10 @@ CHECK_LIB_WARPED
 m4_include([m4/check_lib_tcmalloc.m4])
 CHECK_LIB_TCMALLOC
 
-CXXFLAGS="-Wall -Wextra -pedantic -Werror $CXXFLAGS"
+CXXFLAGS="-Wall -Wextra -Werror -pedantic $CXXFLAGS"
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([deps/Makefile])
-AC_CONFIG_FILES([deps/re2/Makefile])
 AC_CONFIG_FILES([deps/ppm/Makefile])
 AC_CONFIG_FILES([models/Makefile])
 AC_CONFIG_FILES([models/phold/Makefile])

deps/Makefile.am

@@ -1 +1 @@
-SUBDIRS = re2 ppm
+SUBDIRS = ppm