From 910e0a5dc39e4398f5450c778521d65e94f446a2 Mon Sep 17 00:00:00 2001
From: rmrf <nospam@uwaterloo.ca>
Date: Mon, 31 Dec 2018 06:35:57 -0500
Subject: [PATCH] How about c++17?

---
 CMakeLists.txt     | 4 ++--
 paths.sh           | 4 ++--
 scripts/paths.fish | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2349ef9..b5da72e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
   project(systemc-clang)
-  # Use C++ standard version to c++14
-  set(CMAKE_CXX_STANDARD 14)
+  # Use C++ standard version to c++17
+  set(CMAKE_CXX_STANDARD 17)
   # Always keep it on
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
diff --git a/paths.sh b/paths.sh
index 74292f5..83bc745 100644
--- a/paths.sh
+++ b/paths.sh
@@ -25,11 +25,11 @@ LLVMCONFIG=$LLVM_BUILD_DIR/bin/llvm-config
 # Alternatively, you can use gcc and g++, but some flags don't work.
 export CC=clang
 export CXX=clang++
-export LLVM_CXX_FLAGS=`$LLVMCONFIG --cxxflags`
+export LLVM_CXX_FLAGS="`$LLVMCONFIG --cxxflags` -fno-aligned-allocation"
 
 # Generate all the flags.
 export LLVM_CXX_FLAGS="$LLVM_CXX_FLAGS -fvisibility-inlines-hidden"
-export LLVM_LIBS=`$LLVMCONFIG --libs` 
+export LLVM_LIBS=`$LLVMCONFIG --libs`
 export LLVM_LD_FLAGS=`$LLVMCONFIG --ldflags`
 export LLVM_LD_FLAGS=`echo $LLVM_LD_FLAGS | sed 's/ *$//g'`
 
diff --git a/scripts/paths.fish b/scripts/paths.fish
index 5cd1610..f8d9949 100644
--- a/scripts/paths.fish
+++ b/scripts/paths.fish
@@ -28,7 +28,8 @@ set -x CXX clang++
 set -x LLVM_CXX_FLAGS (eval $LLVMCONFIG --cxxflags)
 
 # Generate all the flags.
-set -x LLVM_CXX_FLAGS "$LLVM_CXX_FLAGS -fvisibility-inlines-hidden -faligned-allocation"
+# -fno-aligned-allocation needed for c++17
+set -x LLVM_CXX_FLAGS "$LLVM_CXX_FLAGS -fvisibility-inlines-hidden -fno-aligned-allocation"
 set -x LLVM_LIBS (eval $LLVMCONFIG --libs)
 set -x LLVM_LD_FLAGS (eval $LLVMCONFIG --ldflags)
 set -x LLVM_LD_FLAGS (echo $LLVM_LD_FLAGS | sed 's/ *$//g')
-- 
GitLab