Regenerated the parser bindings with fully qualified types.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

src/CppParser/Bindings/CLI/AST.cpp

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #include "AST.h"
 
 using namespace System;

src/CppParser/Bindings/CLI/AST.h

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #pragma once
 
 #include "CppSharp.h"

src/CppParser/Bindings/CLI/CppParser.cpp

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #include "CppParser.h"
 #include "AST.h"
 #include "Target.h"

src/CppParser/Bindings/CLI/CppParser.h

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #pragma once
 
 #include "CppSharp.h"

src/CppParser/Bindings/CLI/Sources.cpp

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #include "Sources.h"
 
 using namespace System;

src/CppParser/Bindings/CLI/Sources.h

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #pragma once
 
 #include "CppSharp.h"

src/CppParser/Bindings/CLI/Target.cpp

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #include "Target.h"
 
 using namespace System;

src/CppParser/Bindings/CLI/Target.h

@@ -1,3 +1,9 @@
+//----------------------------------------------------------------------------
+// <auto-generated>
+// This is autogenerated code by CppSharp.
+// Do not edit this file or all your changes will be lost after re-generation.
+// </auto-generated>
+//----------------------------------------------------------------------------
 #pragma once
 
 #include "CppSharp.h"

src/CppParser/Bindings/CSharp/i686-apple-darwin12.4.0/Std.cs

@@ -161,29 +161,29 @@ namespace Std
             public global::System.IntPtr __Instance { get; protected set; }
 
             protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.Allocator>();
             protected void*[] __OriginalVTables;
 
             protected bool __ownsNativeInstance;
 
-            internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+            internal static global::Std.__1.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
             {
                 return new Allocator(native.ToPointer(), skipVTables);
             }
 
-            internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+            internal static global::Std.__1.Allocator __CreateInstance(global::Std.__1.Allocator.__Internal native, bool skipVTables = false)
             {
                 return new Allocator(native, skipVTables);
             }
 
-            private static void* __CopyValue(__Internal native)
+            private static void* __CopyValue(global::Std.__1.Allocator.__Internal native)
             {
                 var ret = Marshal.AllocHGlobal(0);
-                *(__Internal*) ret = native;
+                *(global::Std.__1.Allocator.__Internal*) ret = native;
                 return ret.ToPointer();
             }
 
-            private Allocator(__Internal native, bool skipVTables = false)
+            private Allocator(global::Std.__1.Allocator.__Internal native, bool skipVTables = false)
                 : this(__CopyValue(native), skipVTables)
             {
                 __ownsNativeInstance = true;
@@ -1399,29 +1399,29 @@ namespace Std
             public global::System.IntPtr __Instance { get; protected set; }
 
             protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.BasicString>();
             protected void*[] __OriginalVTables;
 
             protected bool __ownsNativeInstance;
 
-            internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+            internal static global::Std.__1.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
             {
                 return new BasicString(native.ToPointer(), skipVTables);
             }
 
-            internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+            internal static global::Std.__1.BasicString __CreateInstance(global::Std.__1.BasicString.__Internal native, bool skipVTables = false)
             {
                 return new BasicString(native, skipVTables);
             }
 
-            private static void* __CopyValue(__Internal native)
+            private static void* __CopyValue(global::Std.__1.BasicString.__Internal native)
             {
                 var ret = Marshal.AllocHGlobal(12);
-                *(__Internal*) ret = native;
+                *(global::Std.__1.BasicString.__Internal*) ret = native;
                 return ret.ToPointer();
             }
 
-            private BasicString(__Internal native, bool skipVTables = false)
+            private BasicString(global::Std.__1.BasicString.__Internal native, bool skipVTables = false)
                 : this(__CopyValue(native), skipVTables)
             {
                 __ownsNativeInstance = true;

src/CppParser/Bindings/CSharp/i686-pc-win32-msvc/Std.cs

@@ -405,29 +405,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new Allocator(native.ToPointer(), skipVTables);
         }
 
-        internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::Std.Allocator.__Internal native, bool skipVTables = false)
         {
             return new Allocator(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(0);
-            *(__Internal*) ret = native;
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private Allocator(__Internal native, bool skipVTables = false)
+        private Allocator(global::Std.Allocator.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -501,29 +501,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new BasicString(native.ToPointer(), skipVTables);
         }
 
-        internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new BasicString(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(24);
-            *(__Internal*) ret = native;
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(__Internal native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -552,13 +552,10 @@ namespace Std
                 Marshal.FreeHGlobal(__Instance);
         }
 
-        public string CStr
+        public string CStr()
         {
-            get
+            var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-            {
+            return Marshal.PtrToStringAnsi(__ret);
-                var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-                return Marshal.PtrToStringAnsi(__ret);
-            }
         }
     }
 

src/CppParser/Bindings/CSharp/x86_64-apple-darwin12.4.0/Std.cs

@@ -161,29 +161,29 @@ namespace Std
             public global::System.IntPtr __Instance { get; protected set; }
 
             protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.Allocator>();
             protected void*[] __OriginalVTables;
 
             protected bool __ownsNativeInstance;
 
-            internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+            internal static global::Std.__1.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
             {
                 return new Allocator(native.ToPointer(), skipVTables);
             }
 
-            internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+            internal static global::Std.__1.Allocator __CreateInstance(global::Std.__1.Allocator.__Internal native, bool skipVTables = false)
             {
                 return new Allocator(native, skipVTables);
             }
 
-            private static void* __CopyValue(__Internal native)
+            private static void* __CopyValue(global::Std.__1.Allocator.__Internal native)
             {
                 var ret = Marshal.AllocHGlobal(0);
-                *(__Internal*) ret = native;
+                *(global::Std.__1.Allocator.__Internal*) ret = native;
                 return ret.ToPointer();
             }
 
-            private Allocator(__Internal native, bool skipVTables = false)
+            private Allocator(global::Std.__1.Allocator.__Internal native, bool skipVTables = false)
                 : this(__CopyValue(native), skipVTables)
             {
                 __ownsNativeInstance = true;
@@ -1399,29 +1399,29 @@ namespace Std
             public global::System.IntPtr __Instance { get; protected set; }
 
             protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.__1.BasicString>();
             protected void*[] __OriginalVTables;
 
             protected bool __ownsNativeInstance;
 
-            internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+            internal static global::Std.__1.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
             {
                 return new BasicString(native.ToPointer(), skipVTables);
             }
 
-            internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+            internal static global::Std.__1.BasicString __CreateInstance(global::Std.__1.BasicString.__Internal native, bool skipVTables = false)
             {
                 return new BasicString(native, skipVTables);
             }
 
-            private static void* __CopyValue(__Internal native)
+            private static void* __CopyValue(global::Std.__1.BasicString.__Internal native)
             {
                 var ret = Marshal.AllocHGlobal(24);
-                *(__Internal*) ret = native;
+                *(global::Std.__1.BasicString.__Internal*) ret = native;
                 return ret.ToPointer();
             }
 
-            private BasicString(__Internal native, bool skipVTables = false)
+            private BasicString(global::Std.__1.BasicString.__Internal native, bool skipVTables = false)
                 : this(__CopyValue(native), skipVTables)
             {
                 __ownsNativeInstance = true;

src/CppParser/Bindings/CSharp/x86_64-linux-gnu-cxx11abi/Std.cs

@@ -58,29 +58,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new Allocator(native.ToPointer(), skipVTables);
         }
 
-        internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::Std.Allocator.__Internal native, bool skipVTables = false)
         {
             return new Allocator(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(0);
-            *(__Internal*) ret = native;
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private Allocator(__Internal native, bool skipVTables = false)
+        private Allocator(global::Std.Allocator.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -618,29 +618,29 @@ namespace Std
             public global::System.IntPtr __Instance { get; protected set; }
 
             protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Cxx11.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Cxx11.BasicString>();
             protected void*[] __OriginalVTables;
 
             protected bool __ownsNativeInstance;
 
-            internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+            internal static global::Std.Cxx11.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
             {
                 return new BasicString(native.ToPointer(), skipVTables);
             }
 
-            internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+            internal static global::Std.Cxx11.BasicString __CreateInstance(global::Std.Cxx11.BasicString.__Internal native, bool skipVTables = false)
             {
                 return new BasicString(native, skipVTables);
             }
 
-            private static void* __CopyValue(__Internal native)
+            private static void* __CopyValue(global::Std.Cxx11.BasicString.__Internal native)
             {
                 var ret = Marshal.AllocHGlobal(32);
-                *(__Internal*) ret = native;
+                *(global::Std.Cxx11.BasicString.__Internal*) ret = native;
                 return ret.ToPointer();
             }
 
-            private BasicString(__Internal native, bool skipVTables = false)
+            private BasicString(global::Std.Cxx11.BasicString.__Internal native, bool skipVTables = false)
                 : this(__CopyValue(native), skipVTables)
             {
                 __ownsNativeInstance = true;
@@ -669,13 +669,10 @@ namespace Std
                     Marshal.FreeHGlobal(__Instance);
             }
 
-            public string CStr
+            public string CStr()
             {
-                get
+                var __ret = global::Std.Cxx11.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-                {
+                return Marshal.PtrToStringAnsi(__ret);
-                    var __ret = global::Std.Cxx11.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-                    return Marshal.PtrToStringAnsi(__ret);
-                }
             }
         }
 

src/CppParser/Bindings/CSharp/x86_64-linux-gnu/Std.cs

@@ -58,29 +58,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new Allocator(native.ToPointer(), skipVTables);
         }
 
-        internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::Std.Allocator.__Internal native, bool skipVTables = false)
         {
             return new Allocator(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(0);
-            *(__Internal*) ret = native;
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private Allocator(__Internal native, bool skipVTables = false)
+        private Allocator(global::Std.Allocator.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -609,29 +609,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new BasicString(native.ToPointer(), skipVTables);
         }
 
-        internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new BasicString(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(8);
-            *(__Internal*) ret = native;
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(__Internal native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -660,13 +660,10 @@ namespace Std
                 Marshal.FreeHGlobal(__Instance);
         }
 
-        public string CStr
+        public string CStr()
         {
-            get
+            var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-            {
+            return Marshal.PtrToStringAnsi(__ret);
-                var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-                return Marshal.PtrToStringAnsi(__ret);
-            }
         }
     }
 

src/CppParser/Bindings/CSharp/x86_64-pc-win32-msvc/Std.cs

@@ -405,29 +405,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, Allocator>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Allocator>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new Allocator(native.ToPointer(), skipVTables);
         }
 
-        internal static Allocator __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.Allocator __CreateInstance(global::Std.Allocator.__Internal native, bool skipVTables = false)
         {
             return new Allocator(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.Allocator.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(0);
-            *(__Internal*) ret = native;
+            *(global::Std.Allocator.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private Allocator(__Internal native, bool skipVTables = false)
+        private Allocator(global::Std.Allocator.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -511,29 +511,29 @@ namespace Std
         public global::System.IntPtr __Instance { get; protected set; }
 
         protected int __PointerAdjustment;
-        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, BasicString>();
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString>();
         protected void*[] __OriginalVTables;
 
         protected bool __ownsNativeInstance;
 
-        internal static BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
         {
             return new BasicString(native.ToPointer(), skipVTables);
         }
 
-        internal static BasicString __CreateInstance(__Internal native, bool skipVTables = false)
+        internal static global::Std.BasicString __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
         {
             return new BasicString(native, skipVTables);
         }
 
-        private static void* __CopyValue(__Internal native)
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
         {
             var ret = Marshal.AllocHGlobal(32);
-            *(__Internal*) ret = native;
+            *(global::Std.BasicString.__Internal*) ret = native;
             return ret.ToPointer();
         }
 
-        private BasicString(__Internal native, bool skipVTables = false)
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
             : this(__CopyValue(native), skipVTables)
         {
             __ownsNativeInstance = true;
@@ -562,13 +562,10 @@ namespace Std
                 Marshal.FreeHGlobal(__Instance);
         }
 
-        public string CStr
+        public string CStr()
         {
-            get
+            var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-            {
+            return Marshal.PtrToStringAnsi(__ret);
-                var __ret = global::Std.BasicString.__Internal.CStr_0((__Instance + __PointerAdjustment));
-                return Marshal.PtrToStringAnsi(__ret);
-            }
         }
     }