Regenerated the parser bindings.

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

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

@@ -1,7 +1,7 @@
 #include <string>
 
 
-template __attribute__((visibility("default"))) std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::basic_string(const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type*, const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::allocator_type&);
-template __attribute__((visibility("default"))) std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::~basic_string();
-template __attribute__((visibility("default"))) const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type* std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::c_str() const noexcept;
-template __attribute__((visibility("default"))) std::__1::allocator<char>::allocator() noexcept;
+template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type*, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::allocator_type&);
+template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
+template __attribute__((visibility("default"))) const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
+template __attribute__((visibility("default"))) std::allocator<char>::allocator() noexcept;

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

@@ -15,15 +15,6 @@ using System.Runtime.CompilerServices;
 
 namespace Std
 {
-    public unsafe partial class Lockit
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 4)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal int _Locktype;
-        }
-    }
 }
 
 namespace Std
@@ -32,31 +23,6 @@ namespace Std
 
 namespace Std
 {
-    public unsafe partial class ExceptionPtr
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Data1;
-
-            [FieldOffset(4)]
-            internal global::System.IntPtr _Data2;
-        }
-    }
-}
-
-public unsafe partial class StdExceptionData
-{
-    [StructLayout(LayoutKind.Explicit, Size = 8)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal global::System.IntPtr _What;
-
-        [FieldOffset(4)]
-        internal byte _DoFree;
-    }
 }
 
 namespace Std
@@ -134,29 +100,6 @@ namespace Std
 
 namespace Std
 {
-    namespace Yarn
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S__Yarn__C
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myptr;
-
-            [FieldOffset(4)]
-            internal sbyte _Nul;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public unsafe partial struct __Internalc__N_std_S__Yarn__W
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myptr;
-
-            [FieldOffset(4)]
-            internal char _Nul;
-        }
-    }
-
     namespace CompressedPair
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -439,6 +382,10 @@ namespace Std
             internal global::Std.VectorVal.__Internal _Myval2;
         }
     }
+
+    public unsafe partial class CompressedPair<_Ty1, _Ty2, _73>
+    {
+    }
 }
 
 namespace Std
@@ -691,6 +638,19 @@ namespace Std
             }
         }
     }
+
+    public unsafe partial class StringVal<_Val_types>
+    {
+        public enum BUF_SIZE
+        {
+            BUF_SIZE = 0
+        }
+
+        public enum ALLOC_MASK
+        {
+            ALLOC_MASK = 0
+        }
+    }
 }
 
 namespace Std
@@ -711,6 +671,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class VectorVal<_Val_types>
+    {
+    }
+
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 12)]
@@ -720,6 +684,10 @@ namespace Std
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
         }
     }
+
+    public unsafe partial class Vector<_Ty, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -740,6 +708,15 @@ namespace Std
             internal uint _Mysize;
         }
     }
+
+    public unsafe partial class TreeVal<_Val_types>
+    {
+        public enum Redbl
+        {
+            Red = 0,
+            Black = 0
+        }
+    }
 }
 
 namespace Std
@@ -753,56 +730,9 @@ namespace Std
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
-}
-
-public unsafe partial class StdTypeInfoData
-{
-    [StructLayout(LayoutKind.Explicit, Size = 8)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal global::System.IntPtr _UndecoratedName;
-
-        [FieldOffset(4)]
-        internal fixed sbyte _DecoratedName[1];
-    }
-}
-
-public unsafe partial class Ctypevec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal uint _Page;
-
-        [FieldOffset(4)]
-        internal global::System.IntPtr _Table;
-
-        [FieldOffset(8)]
-        internal int _Delfl;
-
-        [FieldOffset(12)]
-        internal global::System.IntPtr _LocaleName;
-    }
-}
 
-public unsafe partial class Cvtvec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 44)]
-    public partial struct __Internal
+    public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
     {
-        [FieldOffset(0)]
-        internal uint _Page;
-
-        [FieldOffset(4)]
-        internal uint _Mbcurmax;
-
-        [FieldOffset(8)]
-        internal int _Isclocale;
-
-        [FieldOffset(12)]
-        internal fixed byte _Isleadbyte[32];
     }
 }
 
@@ -818,23 +748,8 @@ namespace Std
 
 namespace Std
 {
-    public unsafe partial class ErrorCode
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 8)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal int _Myval;
-
-            [FieldOffset(4)]
-            internal global::System.IntPtr _Mycat;
-        }
-    }
 }
 
 namespace Std
 {
-    namespace Literals
-    {
-    }
 }

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

@@ -1,7 +1,7 @@
 #include <string>
 
 
-template __attribute__((visibility("default"))) std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::basic_string(const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type*, const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::allocator_type&);
-template __attribute__((visibility("default"))) std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::~basic_string();
-template __attribute__((visibility("default"))) const std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::value_type* std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char>>::c_str() const noexcept;
-template __attribute__((visibility("default"))) std::__1::allocator<char>::allocator() noexcept;
+template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type*, const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::allocator_type&);
+template __attribute__((visibility("default"))) std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string() noexcept;
+template __attribute__((visibility("default"))) const std::basic_string<char, std::char_traits<char>, std::allocator<char>>::value_type* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
+template __attribute__((visibility("default"))) std::allocator<char>::allocator() noexcept;

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

@@ -1,7 +1,7 @@
 #include <string>
 
 
-template std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char*, const std::allocator<char>&);
-template std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string();
-template const char* std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
+template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::basic_string(const char*, const std::allocator<char>&);
+template std::basic_string<char, std::char_traits<char>, std::allocator<char>>::~basic_string();
+template const char* std::basic_string<char, std::char_traits<char>, std::allocator<char>>::c_str() const noexcept;
 template std::allocator<char>::allocator();

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

@@ -25,15 +25,6 @@ namespace Std
 {
     namespace ExceptionPtr
     {
-        public unsafe partial class ExceptionPtr
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 8)]
-            public partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::System.IntPtr _M_exception_object;
-            }
-        }
     }
 }
 
@@ -168,6 +159,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class VectorBase<_Tp, _Alloc>
+    {
+    }
+
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -177,6 +172,10 @@ namespace Std
             internal global::Std.VectorBase.VectorImpl.__Internal _M_impl;
         }
     }
+
+    public unsafe partial class Vector<_Tp, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -193,19 +192,6 @@ namespace Std
             internal uint _M_offset;
         }
     }
-
-    public unsafe partial class BitConstIterator
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _M_p;
-
-            [FieldOffset(8)]
-            internal uint _M_offset;
-        }
-    }
 }
 
 namespace Std
@@ -217,6 +203,10 @@ namespace Std
         {
         }
     }
+
+    public unsafe partial class Less<_Tp>
+    {
+    }
 }
 
 namespace Std
@@ -272,6 +262,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class RbTree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>
+    {
+    }
+
     public unsafe partial class RbTreeNodeBase
     {
         [StructLayout(LayoutKind.Explicit, Size = 32)]
@@ -316,6 +310,10 @@ namespace Std
             }
         }
     }
+
+    public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -324,13 +322,6 @@ namespace Std
 
 namespace Std
 {
-    namespace Cxx11
-    {
-    }
-
-    namespace Cxx11
-    {
-    }
 }
 
 public unsafe partial class MbstateT
@@ -436,32 +427,6 @@ namespace Std
 {
 }
 
-public unsafe partial class Timespec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal long tv_sec;
-
-        [FieldOffset(8)]
-        internal long tv_nsec;
-    }
-}
-
-public unsafe partial class Timeval
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal long tv_sec;
-
-        [FieldOffset(8)]
-        internal long tv_usec;
-    }
-}
-
 public unsafe partial class PthreadInternalList
 {
     [StructLayout(LayoutKind.Explicit, Size = 16)]
@@ -628,199 +593,170 @@ public unsafe partial struct PthreadRwlockT
     }
 }
 
-public unsafe partial class PthreadUnwindBufT
+namespace Std
 {
-    [StructLayout(LayoutKind.Explicit, Size = 104)]
-    public partial struct __Internal
+    public unsafe static partial class BasicStringExtensions
     {
-        [FieldOffset(0)]
-        internal fixed byte __cancel_jmp_buf[72];
-
-        [FieldOffset(72)]
-        internal void* __pad;
-    }
-
-    public unsafe partial class _
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 72)]
+        [StructLayout(LayoutKind.Explicit, Size = 0)]
         public partial struct __Internal
         {
-            [FieldOffset(0)]
-            internal fixed long __cancel_jmp_buf[8];
+            [SuppressUnmanagedCodeSecurity]
+            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcRKS3_")]
+            internal static extern global::System.IntPtr BasicString(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string __s, global::System.IntPtr __a);
 
-            [FieldOffset(64)]
-            internal int __mask_was_saved;
+            [SuppressUnmanagedCodeSecurity]
+            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
+            internal static extern global::System.IntPtr CStr(global::System.IntPtr instance);
         }
-    }
-}
 
-namespace Std
-{
-    namespace Cxx11
-    {
-        public unsafe static partial class BasicStringExtensions
+        public static global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> BasicString(string __s, global::Std.Allocator<sbyte> __a)
         {
-            [StructLayout(LayoutKind.Explicit, Size = 0)]
-            public partial struct __Internal
-            {
-                [SuppressUnmanagedCodeSecurity]
-                [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                    EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcRKS3_")]
-                internal static extern global::System.IntPtr BasicString(global::System.IntPtr instance, [MarshalAs(UnmanagedType.LPStr)] string __s, global::System.IntPtr __a);
-
-                [SuppressUnmanagedCodeSecurity]
-                [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                    EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
-                internal static extern global::System.IntPtr CStr(global::System.IntPtr instance);
-            }
-
-            public static global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> BasicString(string __s, global::Std.Allocator<sbyte> __a)
-            {
-                if (ReferenceEquals(__a, null))
-                    throw new global::System.ArgumentNullException("__a", "Cannot be null because it is a C++ reference (&).");
-                var __arg1 = __a.__Instance;
-                var __ret = Marshal.AllocHGlobal(32);
-                __Internal.BasicString(__ret, __s, __arg1);
-                global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> __result0;
-                if (__ret == IntPtr.Zero) __result0 = null;
-                else if (global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.NativeToManagedMap.ContainsKey(__ret))
-                    __result0 = (global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>) global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.NativeToManagedMap[__ret];
-                else __result0 = global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(__ret);
-                return __result0;
-            }
+            if (ReferenceEquals(__a, null))
+                throw new global::System.ArgumentNullException("__a", "Cannot be null because it is a C++ reference (&).");
+            var __arg1 = __a.__Instance;
+            var __ret = Marshal.AllocHGlobal(32);
+            __Internal.BasicString(__ret, __s, __arg1);
+            global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> __result0;
+            if (__ret == IntPtr.Zero) __result0 = null;
+            else if (global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.NativeToManagedMap.ContainsKey(__ret))
+                __result0 = (global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>) global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.NativeToManagedMap[__ret];
+            else __result0 = global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.__CreateInstance(__ret);
+            return __result0;
+        }
 
-            public static string CStr(this global::Std.Cxx11.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
-            {
-                var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
-                var __ret = __Internal.CStr(__arg0);
-                return Marshal.PtrToStringAnsi(__ret);
-            }
+        public static string CStr(this global::Std.BasicString<sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>> @this)
+        {
+            var __arg0 = ReferenceEquals(@this, null) ? global::System.IntPtr.Zero : @this.__Instance;
+            var __ret = __Internal.CStr(__arg0);
+            return Marshal.PtrToStringAnsi(__ret);
         }
+    }
 
-        namespace BasicString
+    namespace BasicString
+    {
+        [StructLayout(LayoutKind.Explicit, Size = 32)]
+        public unsafe partial struct __Internal
         {
-            [StructLayout(LayoutKind.Explicit, Size = 32)]
-            public unsafe partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::Std.Cxx11.BasicString.AllocHider.__Internal _M_dataplus;
+            [FieldOffset(0)]
+            internal global::Std.BasicString.AllocHider.__Internal _M_dataplus;
 
-                [FieldOffset(8)]
-                internal ulong _M_string_length;
+            [FieldOffset(8)]
+            internal ulong _M_string_length;
 
-                [FieldOffset(16)]
-                internal global::Std.Cxx11.BasicString._.__Internal _;
+            [FieldOffset(16)]
+            internal global::Std.BasicString._.__Internal _;
 
-                [SuppressUnmanagedCodeSecurity]
-                [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                    EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev")]
-                internal static extern void dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr instance);
+            [SuppressUnmanagedCodeSecurity]
+            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                EntryPoint="_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev")]
+            internal static extern void dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr instance);
 
-                [SuppressUnmanagedCodeSecurity]
-                [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
-                    EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
-                internal static extern global::System.IntPtr CStrc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr instance);
-            }
+            [SuppressUnmanagedCodeSecurity]
+            [DllImport("Std-symbols", CallingConvention = global::System.Runtime.InteropServices.CallingConvention.Cdecl,
+                EntryPoint="_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE5c_strEv")]
+            internal static extern global::System.IntPtr CStrc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C(global::System.IntPtr instance);
+        }
 
 
-            public unsafe partial class AllocHider
+        public unsafe partial class AllocHider
+        {
+            [StructLayout(LayoutKind.Explicit, Size = 8)]
+            public partial struct __Internal
             {
-                [StructLayout(LayoutKind.Explicit, Size = 8)]
-                public partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal global::System.IntPtr _M_p;
-                }
-
+                [FieldOffset(0)]
+                internal global::System.IntPtr _M_p;
             }
 
-            public unsafe partial struct _
+        }
+
+        public unsafe partial struct _
+        {
+            [StructLayout(LayoutKind.Explicit, Size = 16)]
+            public partial struct __Internal
             {
-                [StructLayout(LayoutKind.Explicit, Size = 16)]
-                public partial struct __Internal
-                {
-                    [FieldOffset(0)]
-                    internal fixed sbyte _M_local_buf[16];
+                [FieldOffset(0)]
+                internal fixed sbyte _M_local_buf[16];
 
-                    [FieldOffset(0)]
-                    internal ulong _M_allocated_capacity;
-                }
+                [FieldOffset(0)]
+                internal ulong _M_allocated_capacity;
             }
         }
+    }
 
-        public unsafe partial class BasicString<_CharT, _Traits, _Alloc> : IDisposable
+    public unsafe partial class BasicString<_CharT, _Traits, _Alloc> : IDisposable
+    {
+        internal enum S_localCapacity
         {
-            internal enum S_localCapacity
-            {
-                S_localCapacity = 0
-            }
+            S_localCapacity = 0
+        }
 
-            public global::System.IntPtr __Instance { get; protected set; }
+        public global::System.IntPtr __Instance { get; protected set; }
 
-            protected int __PointerAdjustment;
-            internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc>> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc>>();
-            protected void*[] __OriginalVTables;
+        protected int __PointerAdjustment;
+        internal static readonly global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString<_CharT, _Traits, _Alloc>> NativeToManagedMap = new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::Std.BasicString<_CharT, _Traits, _Alloc>>();
+        protected void*[] __OriginalVTables;
 
-            protected bool __ownsNativeInstance;
+        protected bool __ownsNativeInstance;
 
-            internal static global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
-            {
-                return new global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc>(native.ToPointer(), skipVTables);
-            }
+        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::System.IntPtr native, bool skipVTables = false)
+        {
+            return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native.ToPointer(), skipVTables);
+        }
 
-            internal static global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.Cxx11.BasicString.__Internal native, bool skipVTables = false)
-            {
-                return new global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc>(native, skipVTables);
-            }
+        internal static global::Std.BasicString<_CharT, _Traits, _Alloc> __CreateInstance(global::Std.BasicString.__Internal native, bool skipVTables = false)
+        {
+            return new global::Std.BasicString<_CharT, _Traits, _Alloc>(native, skipVTables);
+        }
 
-            private static void* __CopyValue(global::Std.Cxx11.BasicString.__Internal native)
-            {
-                var ret = Marshal.AllocHGlobal(sizeof(global::Std.Cxx11.BasicString.__Internal));
-                *(global::Std.Cxx11.BasicString.__Internal*) ret = native;
-                return ret.ToPointer();
-            }
+        private static void* __CopyValue(global::Std.BasicString.__Internal native)
+        {
+            var ret = Marshal.AllocHGlobal(sizeof(global::Std.BasicString.__Internal));
+            *(global::Std.BasicString.__Internal*) ret = native;
+            return ret.ToPointer();
+        }
 
-            private BasicString(global::Std.Cxx11.BasicString.__Internal native, bool skipVTables = false)
-                : this(__CopyValue(native), skipVTables)
-            {
-                __ownsNativeInstance = true;
-                NativeToManagedMap[__Instance] = this;
-            }
+        private BasicString(global::Std.BasicString.__Internal native, bool skipVTables = false)
+            : this(__CopyValue(native), skipVTables)
+        {
+            __ownsNativeInstance = true;
+            NativeToManagedMap[__Instance] = this;
+        }
 
-            protected BasicString(void* native, bool skipVTables = false)
-            {
-                if (native == null)
-                    return;
-                __Instance = new global::System.IntPtr(native);
-            }
+        protected BasicString(void* native, bool skipVTables = false)
+        {
+            if (native == null)
+                return;
+            __Instance = new global::System.IntPtr(native);
+        }
 
-            public void Dispose()
-            {
-                Dispose(disposing: true);
-            }
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+        }
 
-            public virtual void Dispose(bool disposing)
+        public virtual void Dispose(bool disposing)
+        {
+            if (__Instance == IntPtr.Zero)
+                return;
+            global::Std.BasicString<_CharT, _Traits, _Alloc> __dummy;
+            NativeToManagedMap.TryRemove(__Instance, out __dummy);
+            if (disposing)
             {
-                if (__Instance == IntPtr.Zero)
-                    return;
-                global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc> __dummy;
-                NativeToManagedMap.TryRemove(__Instance, out __dummy);
-                if (disposing)
+                var ___CharT = typeof(_CharT);
+                var ___Traits = typeof(_Traits);
+                var ___Alloc = typeof(_Alloc);
+                if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
                 {
-                    var ___CharT = typeof(_CharT);
-                    var ___Traits = typeof(_Traits);
-                    var ___Alloc = typeof(_Alloc);
-                    if (___CharT.IsAssignableFrom(typeof(sbyte)) && ___Traits.IsAssignableFrom(typeof(global::Std.CharTraits<sbyte>)) && ___Alloc.IsAssignableFrom(typeof(global::Std.Allocator<sbyte>)))
-                    {
-                        global::Std.Cxx11.BasicString.__Internal.dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
-                        return;
-                    }
-                    throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.Cxx11.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
+                    global::Std.BasicString.__Internal.dtorc__N_std_N___cxx11_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C((__Instance + __PointerAdjustment));
+                    return;
                 }
-                if (__ownsNativeInstance)
-                    Marshal.FreeHGlobal(__Instance);
-                __Instance = IntPtr.Zero;
+                throw new ArgumentOutOfRangeException("_CharT, _Traits, _Alloc", string.Join(", ", new[] { typeof(_CharT).FullName, typeof(_Traits).FullName, typeof(_Alloc).FullName }), "global::Std.BasicString<_CharT, _Traits, _Alloc> maps a C++ template class and therefore it only supports a limited set of types and their subclasses: <sbyte, global::Std.CharTraits<sbyte>, global::Std.Allocator<sbyte>>.");
             }
+            if (__ownsNativeInstance)
+                Marshal.FreeHGlobal(__Instance);
+            __Instance = IntPtr.Zero;
         }
     }
 }
@@ -878,13 +814,6 @@ public unsafe partial struct Wait
 
 namespace Std
 {
-    namespace Cxx11
-    {
-    }
-
-    namespace Cxx11
-    {
-    }
 }
 
 namespace Std

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

@@ -25,15 +25,6 @@ namespace Std
 {
     namespace ExceptionPtr
     {
-        public unsafe partial class ExceptionPtr
-        {
-            [StructLayout(LayoutKind.Explicit, Size = 8)]
-            public partial struct __Internal
-            {
-                [FieldOffset(0)]
-                internal global::System.IntPtr _M_exception_object;
-            }
-        }
     }
 }
 
@@ -177,6 +168,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class VectorBase<_Tp, _Alloc>
+    {
+    }
+
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -186,6 +181,10 @@ namespace Std
             internal global::Std.VectorBase.VectorImpl.__Internal _M_impl;
         }
     }
+
+    public unsafe partial class Vector<_Tp, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -202,19 +201,6 @@ namespace Std
             internal uint _M_offset;
         }
     }
-
-    public unsafe partial class BitConstIterator
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _M_p;
-
-            [FieldOffset(8)]
-            internal uint _M_offset;
-        }
-    }
 }
 
 namespace Std
@@ -226,6 +212,10 @@ namespace Std
         {
         }
     }
+
+    public unsafe partial class Less<_Tp>
+    {
+    }
 }
 
 namespace Std
@@ -281,6 +271,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class RbTree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>
+    {
+    }
+
     public unsafe partial class RbTreeNodeBase
     {
         [StructLayout(LayoutKind.Explicit, Size = 32)]
@@ -325,6 +319,10 @@ namespace Std
             }
         }
     }
+
+    public unsafe partial class Map<_Key, _Tp, _Compare, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -430,32 +428,6 @@ namespace Std
     }
 }
 
-public unsafe partial class Timespec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal long tv_sec;
-
-        [FieldOffset(8)]
-        internal long tv_nsec;
-    }
-}
-
-public unsafe partial class Timeval
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal long tv_sec;
-
-        [FieldOffset(8)]
-        internal long tv_usec;
-    }
-}
-
 public unsafe partial class PthreadInternalList
 {
     [StructLayout(LayoutKind.Explicit, Size = 16)]
@@ -622,32 +594,6 @@ public unsafe partial struct PthreadRwlockT
     }
 }
 
-public unsafe partial class PthreadUnwindBufT
-{
-    [StructLayout(LayoutKind.Explicit, Size = 104)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal fixed byte __cancel_jmp_buf[72];
-
-        [FieldOffset(72)]
-        internal void* __pad;
-    }
-
-    public unsafe partial class _
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 72)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal fixed long __cancel_jmp_buf[8];
-
-            [FieldOffset(64)]
-            internal int __mask_was_saved;
-        }
-    }
-}
-
 namespace Std
 {
     public unsafe static partial class BasicStringExtensions

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

@@ -15,15 +15,6 @@ using System.Runtime.CompilerServices;
 
 namespace Std
 {
-    public unsafe partial class Lockit
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 4)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal int _Locktype;
-        }
-    }
 }
 
 namespace Std
@@ -32,31 +23,6 @@ namespace Std
 
 namespace Std
 {
-    public unsafe partial class ExceptionPtr
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Data1;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _Data2;
-        }
-    }
-}
-
-public unsafe partial class StdExceptionData
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal global::System.IntPtr _What;
-
-        [FieldOffset(8)]
-        internal byte _DoFree;
-    }
 }
 
 namespace Std
@@ -134,29 +100,6 @@ namespace Std
 
 namespace Std
 {
-    namespace Yarn
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public unsafe partial struct __Internalc__N_std_S__Yarn__C
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myptr;
-
-            [FieldOffset(8)]
-            internal sbyte _Nul;
-        }
-
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public unsafe partial struct __Internalc__N_std_S__Yarn__W
-        {
-            [FieldOffset(0)]
-            internal global::System.IntPtr _Myptr;
-
-            [FieldOffset(8)]
-            internal char _Nul;
-        }
-    }
-
     namespace CompressedPair
     {
         [StructLayout(LayoutKind.Explicit, Size = 32)]
@@ -439,6 +382,10 @@ namespace Std
             internal global::Std.VectorVal.__Internal _Myval2;
         }
     }
+
+    public unsafe partial class CompressedPair<_Ty1, _Ty2, _73>
+    {
+    }
 }
 
 namespace Std
@@ -691,6 +638,19 @@ namespace Std
             }
         }
     }
+
+    public unsafe partial class StringVal<_Val_types>
+    {
+        public enum BUF_SIZE
+        {
+            BUF_SIZE = 0
+        }
+
+        public enum ALLOC_MASK
+        {
+            ALLOC_MASK = 0
+        }
+    }
 }
 
 namespace Std
@@ -711,6 +671,10 @@ namespace Std
         }
     }
 
+    public unsafe partial class VectorVal<_Val_types>
+    {
+    }
+
     namespace Vector
     {
         [StructLayout(LayoutKind.Explicit, Size = 24)]
@@ -720,6 +684,10 @@ namespace Std
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_allocator_____N_CppSharp_N_CppParser_N_AST_S_PreprocessedEntity___N_std_S__Vector_val____N_std_S__Simple_types__S1__Vb1 _Mypair;
         }
     }
+
+    public unsafe partial class Vector<_Ty, _Alloc>
+    {
+    }
 }
 
 namespace Std
@@ -740,6 +708,15 @@ namespace Std
             internal ulong _Mysize;
         }
     }
+
+    public unsafe partial class TreeVal<_Val_types>
+    {
+        public enum Redbl
+        {
+            Red = 0,
+            Black = 0
+        }
+    }
 }
 
 namespace Std
@@ -753,56 +730,9 @@ namespace Std
             internal global::Std.CompressedPair.__Internalc__N_std_S__Compressed_pair____N_std_S_less____N_std_S_basic_string__C___N_std_S_char_traits__C___N_std_S_allocator__C___N_std_S__Compressed_pair____N_std_S_allocator____N_std_S__Tree_node____N_std_S_pair__1S1_____N_CppSharp_N_CppParser_N_AST_S_Declaration__v___N_std_S__Tree_val____N_std_S__Tree_simple_types__S7__Vb1_Vb1 _Mypair;
         }
     }
-}
-
-public unsafe partial class StdTypeInfoData
-{
-    [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal global::System.IntPtr _UndecoratedName;
-
-        [FieldOffset(8)]
-        internal fixed sbyte _DecoratedName[1];
-    }
-}
-
-public unsafe partial class Ctypevec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 32)]
-    public partial struct __Internal
-    {
-        [FieldOffset(0)]
-        internal uint _Page;
-
-        [FieldOffset(8)]
-        internal global::System.IntPtr _Table;
-
-        [FieldOffset(16)]
-        internal int _Delfl;
-
-        [FieldOffset(24)]
-        internal global::System.IntPtr _LocaleName;
-    }
-}
 
-public unsafe partial class Cvtvec
-{
-    [StructLayout(LayoutKind.Explicit, Size = 44)]
-    public partial struct __Internal
+    public unsafe partial class Map<_Kty, _Ty, _Pr, _Alloc>
     {
-        [FieldOffset(0)]
-        internal uint _Page;
-
-        [FieldOffset(4)]
-        internal uint _Mbcurmax;
-
-        [FieldOffset(8)]
-        internal int _Isclocale;
-
-        [FieldOffset(12)]
-        internal fixed byte _Isleadbyte[32];
     }
 }
 
@@ -818,23 +748,8 @@ namespace Std
 
 namespace Std
 {
-    public unsafe partial class ErrorCode
-    {
-        [StructLayout(LayoutKind.Explicit, Size = 16)]
-        public partial struct __Internal
-        {
-            [FieldOffset(0)]
-            internal int _Myval;
-
-            [FieldOffset(8)]
-            internal global::System.IntPtr _Mycat;
-        }
-    }
 }
 
 namespace Std
 {
-    namespace Literals
-    {
-    }
 }