diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs index 9c7cf04b..0c114316 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17416,7 +17406,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18871,12 +18861,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28799,12 +28784,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36106,12 +36086,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46967,12 +46942,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46988,12 +46958,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47009,12 +46974,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47030,12 +46990,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47051,12 +47006,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47072,12 +47022,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47093,12 +47038,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47504,12 +47444,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47525,12 +47460,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47546,12 +47476,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs index c3f9a4b8..0d78fe33 100644 --- a/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs +++ b/src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs @@ -1275,12 +1275,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } } diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs index 4a2636e9..c3c981b3 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17416,7 +17406,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = *(global::Std.BasicString.__Internalc__N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C*) __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18871,12 +18861,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28799,12 +28784,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36106,12 +36086,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46967,12 +46942,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46988,12 +46958,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47009,12 +46974,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47030,12 +46990,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47051,12 +47006,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47072,12 +47022,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47093,12 +47038,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47504,12 +47444,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47525,12 +47460,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47546,12 +47476,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs index 419b5173..d0ca1a94 100644 --- a/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs +++ b/src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs @@ -972,12 +972,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs index 3cf81a5f..2852e0bb 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17415,7 +17405,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18870,12 +18860,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28798,12 +28783,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36105,12 +36085,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46966,12 +46941,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46987,12 +46957,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47008,12 +46973,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47029,12 +46989,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47050,12 +47005,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47071,12 +47021,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47092,12 +47037,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47503,12 +47443,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47524,12 +47459,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47545,12 +47475,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs index a3ebff89..1f90eae5 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs @@ -1275,12 +1275,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs index a9bdbf84..ff88704f 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17415,7 +17405,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18870,12 +18860,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28798,12 +28783,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36105,12 +36085,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46966,12 +46941,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46987,12 +46957,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47008,12 +46973,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47029,12 +46989,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47050,12 +47005,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47071,12 +47021,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47092,12 +47037,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47503,12 +47443,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47524,12 +47459,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47545,12 +47475,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs index d860790a..0c57156e 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs @@ -1039,12 +1039,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs index 06677045..e29a98ae 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17415,7 +17405,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18870,12 +18860,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28798,12 +28783,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36105,12 +36085,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46966,12 +46941,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46987,12 +46957,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47008,12 +46973,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47029,12 +46989,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47050,12 +47005,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47071,12 +47021,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47092,12 +47037,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47503,12 +47443,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47524,12 +47459,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47545,12 +47475,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs index e785e3fc..61416a41 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs @@ -1016,12 +1016,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } } diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs index a19f9e42..29fb6b9b 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/CppSharp.CppParser.cs @@ -205,12 +205,7 @@ namespace CppSharp public string GetSymbols(uint i) { var __ret = __Internal.GetSymbols(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSymbols(string s) @@ -226,12 +221,7 @@ namespace CppSharp public string GetDependencies(uint i) { var __ret = __Internal.GetDependencies(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDependencies(string s) @@ -17416,7 +17406,7 @@ namespace CppSharp global::Std.BasicStringExtensions.Assign(__basicString0, File); var __arg0 = __basicString0.__Instance; var __ret = __Internal.FindOrCreateModule(__Instance, __arg0); - __basicString0.Dispose(); + __basicString0.Dispose(false); global::CppSharp.Parser.AST.TranslationUnit __result0; if (__ret == IntPtr.Zero) __result0 = null; else if (global::CppSharp.Parser.AST.TranslationUnit.NativeToManagedMap.ContainsKey(__ret)) @@ -18871,12 +18861,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.LabelStmt.__Internal*) __Instance)->name); } set @@ -28799,12 +28784,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CastExpr.__Internal*) __Instance)->castKindName); } set @@ -36106,12 +36086,7 @@ namespace CppSharp { get { - if (((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ((global::CppSharp.Parser.AST.CXXNamedCastExpr.__Internal*) __Instance)->castName); } set @@ -46967,12 +46942,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -46988,12 +46958,7 @@ namespace CppSharp public string GetSourceFiles(uint i) { var __ret = __Internal.GetSourceFiles(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSourceFiles(string s) @@ -47009,12 +46974,7 @@ namespace CppSharp public string GetIncludeDirs(uint i) { var __ret = __Internal.GetIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddIncludeDirs(string s) @@ -47030,12 +46990,7 @@ namespace CppSharp public string GetSystemIncludeDirs(uint i) { var __ret = __Internal.GetSystemIncludeDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSystemIncludeDirs(string s) @@ -47051,12 +47006,7 @@ namespace CppSharp public string GetDefines(uint i) { var __ret = __Internal.GetDefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddDefines(string s) @@ -47072,12 +47022,7 @@ namespace CppSharp public string GetUndefines(uint i) { var __ret = __Internal.GetUndefines(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddUndefines(string s) @@ -47093,12 +47038,7 @@ namespace CppSharp public string GetSupportedStdTypes(uint i) { var __ret = __Internal.GetSupportedStdTypes(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddSupportedStdTypes(string s) @@ -47504,12 +47444,7 @@ namespace CppSharp public string GetArguments(uint i) { var __ret = __Internal.GetArguments(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddArguments(string s) @@ -47525,12 +47460,7 @@ namespace CppSharp public string GetLibraryDirs(uint i) { var __ret = __Internal.GetLibraryDirs(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraryDirs(string s) @@ -47546,12 +47476,7 @@ namespace CppSharp public string GetLibraries(uint i) { var __ret = __Internal.GetLibraries(__Instance, i); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } public void AddLibraries(string s) diff --git a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs index 0796daf0..4d44d338 100644 --- a/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs +++ b/src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs @@ -972,12 +972,7 @@ namespace Std { var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance; var __ret = __Internal.Data(__arg0); - if (__ret == global::System.IntPtr.Zero) - return default(string); - var __retPtr = (byte*) __ret; - int __length = 0; - while (*(__retPtr++) != 0) __length += sizeof(byte); - return global::System.Text.Encoding.UTF8.GetString((byte*) __ret, __length); + return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, __ret); } } }