From 58b800894e363c24e5ae1b0940bea2e8c8fcd905 Mon Sep 17 00:00:00 2001
From: rmrf <nospam@uwaterloo.ca>
Date: Sun, 30 Dec 2018 09:55:54 -0500
Subject: [PATCH] Start using c++14.  Why not?

---
 CMakeLists.txt          | 4 ++++
 scripts/paths.fish      | 2 +-
 src/FindTemplateTypes.h | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7a5d93..2349ef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
   project(systemc-clang)
+  # Use C++ standard version to c++14
+  set(CMAKE_CXX_STANDARD 14)
+  # Always keep it on
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
   option (USE_SAUTO
       "Use suspension-automata library." OFF
diff --git a/scripts/paths.fish b/scripts/paths.fish
index 935454a..5cd1610 100644
--- a/scripts/paths.fish
+++ b/scripts/paths.fish
@@ -28,7 +28,7 @@ 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"
+set -x LLVM_CXX_FLAGS "$LLVM_CXX_FLAGS -fvisibility-inlines-hidden -faligned-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')
diff --git a/src/FindTemplateTypes.h b/src/FindTemplateTypes.h
index fcb2bc9..5e6d8c0 100644
--- a/src/FindTemplateTypes.h
+++ b/src/FindTemplateTypes.h
@@ -112,8 +112,8 @@ namespace scpar {
       }
     }
 
-    vector < string > getTemplateArguments() {
-      vector < string > template_arguments;
+    vector<string> getTemplateArguments() {
+      vector<string> template_arguments;
       // type_vector_t::iterator
       //      for ( auto mit = template_types_.begin(); mit != template_types_.end(); ++mit )  {
       for ( auto const &mit: template_types_ ) {
-- 
GitLab