diff --git a/src/CLI/Generator.cs b/src/CLI/Generator.cs index c49a5741..ab90cf9b 100644 --- a/src/CLI/Generator.cs +++ b/src/CLI/Generator.cs @@ -146,7 +146,6 @@ namespace CppSharp parserOptions.UnityBuild = options.UnityBuild; parserOptions.EnableRTTI = options.EnableRTTI; - parserOptions.EnableExceptions = options.EnableExceptions; parserOptions.Setup(options.Platform ?? Platform.Host); diff --git a/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp index 26e5ae16..c4b4b676 100644 --- a/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp +++ b/src/CppParser/Bindings/CSharp/arm64-apple-darwin/Std-symbols.cpp @@ -1,5 +1,6 @@ #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS #define _LIBCPP_HIDE_FROM_ABI +#define _LIBCPP_NO_ABI_TAG #include #include diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp index 26e5ae16..c4b4b676 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin/Std-symbols.cpp @@ -1,5 +1,6 @@ #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS #define _LIBCPP_HIDE_FROM_ABI +#define _LIBCPP_NO_ABI_TAG #include #include diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp index 26e5ae16..c4b4b676 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp +++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin/Std-symbols.cpp @@ -1,5 +1,6 @@ #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS #define _LIBCPP_HIDE_FROM_ABI +#define _LIBCPP_NO_ABI_TAG #include #include diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp index 3da01071..72fe7671 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std-symbols.cpp @@ -1,5 +1,6 @@ #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS #define _LIBCPP_HIDE_FROM_ABI +#define _LIBCPP_NO_ABI_TAG #include #include diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp index fc98a852..e2d84a31 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std-symbols.cpp @@ -1,5 +1,6 @@ #define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS #define _LIBCPP_HIDE_FROM_ABI +#define _LIBCPP_NO_ABI_TAG #include #include diff --git a/src/CppParser/ParserGen/ParserGen.cs b/src/CppParser/ParserGen/ParserGen.cs index f70d6c7f..5c9b0703 100644 --- a/src/CppParser/ParserGen/ParserGen.cs +++ b/src/CppParser/ParserGen/ParserGen.cs @@ -49,7 +49,6 @@ namespace CppSharp { var parserOptions = driver.ParserOptions; parserOptions.TargetTriple = Triple; - parserOptions.EnableExceptions = false; var options = driver.Options; options.GeneratorKind = Kind; diff --git a/src/CppParser/premake5.lua b/src/CppParser/premake5.lua index 4fabca61..a668f774 100644 --- a/src/CppParser/premake5.lua +++ b/src/CppParser/premake5.lua @@ -51,8 +51,6 @@ project "Std-symbols" language "C++" SetupNativeProject() rtti "Off" - exceptionhandling "Off" - defines { "DLL_EXPORT" } filter { "toolset:msc*" } diff --git a/src/Generator/Passes/SymbolsCodeGenerator.cs b/src/Generator/Passes/SymbolsCodeGenerator.cs index f7d75bba..62c2bf84 100644 --- a/src/Generator/Passes/SymbolsCodeGenerator.cs +++ b/src/Generator/Passes/SymbolsCodeGenerator.cs @@ -33,8 +33,6 @@ namespace CppSharp.Passes WriteLine("#define _LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS"); WriteLine("#define _LIBCPP_HIDE_FROM_ABI"); WriteLine("#define _LIBCPP_NO_ABI_TAG"); - if (!Context.ParserOptions.EnableExceptions) - WriteLine("#define _LIBCPP_HAS_NO_EXCEPTIONS"); NewLine(); WriteLine("#include "); } diff --git a/src/Parser/ParserOptions.cs b/src/Parser/ParserOptions.cs index b1218f4e..51170944 100644 --- a/src/Parser/ParserOptions.cs +++ b/src/Parser/ParserOptions.cs @@ -84,7 +84,6 @@ namespace CppSharp.Parser TargetTriple.Contains("windows") || TargetTriple.Contains("msvc"); public bool EnableRTTI { get; set; } - public bool EnableExceptions { get; set; } public LanguageVersion? LanguageVersion { get; set; } public void BuildForSourceFile( @@ -376,9 +375,6 @@ namespace CppSharp.Parser if (!EnableRTTI) AddArguments("-fno-rtti"); - - if (EnableExceptions) - AddArguments("-fexceptions"); } internal string BuiltinsDirBasePath