zig

commit ce56ae8afe1fd00cc137375332014b8d8a8ef960 (tree)
parent 6f10e3fda6ca3ef2846c87b149d308fa461fdbb0
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed,  2 Oct 2019 13:05:10 -0400

we have to use c++14 now for llvm10

Diffstat:
M
CMakeLists.txt
 | 
2
+-
M
src/zig_llvm.cpp
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -498,7 +498,7 @@ include_directories(
 )
 
 # These have to go before the -Wno- flags
-set(EXE_CFLAGS "-std=c++11")
+set(EXE_CFLAGS "-std=c++14")
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
     if(MSVC)
         set(EXE_CFLAGS "${EXE_CFLAGS} /w")
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
@@ -150,7 +150,7 @@ LLVMTargetMachineRef ZigLLVMCreateTargetMachine(LLVMTargetRef T, const char *Tri
 }
 
 unsigned ZigLLVMDataLayoutGetStackAlignment(LLVMTargetDataRef TD) {
-    return unwrap(TD)->getStackAlignment();
+    return unwrap(TD)->getStackAlignment().value();
 }
 
 bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMModuleRef module_ref,