Merge branch 'master' of github.com:pascalabcnet/pascalabcnet
This commit is contained in:
commit
3670ff6aff
|
|
@ -15,7 +15,7 @@ internal static class RevisionClass
|
|||
public const string Major = "3";
|
||||
public const string Minor = "4";
|
||||
public const string Build = "2";
|
||||
public const string Revision = "1897";
|
||||
public const string Revision = "1898";
|
||||
|
||||
public const string MainVersion = Major + "." + Minor;
|
||||
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%COREVERSION%=2
|
||||
%REVISION%=1897
|
||||
%MINOR%=4
|
||||
%REVISION%=1898
|
||||
%COREVERSION%=2
|
||||
%MAJOR%=3
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
!define VERSION '3.4.2.1897'
|
||||
!define VERSION '3.4.2.1898'
|
||||
|
|
|
|||
|
|
@ -6358,7 +6358,7 @@ begin
|
|||
else if t.IsEnum then Result := f.br.ReadInt32
|
||||
else if t.IsValueType then
|
||||
begin
|
||||
elem := Activator.CreateInstance(t);
|
||||
elem := Activator.CreateInstance(t,true);
|
||||
fa := t.GetFields(System.Reflection.BindingFlags.GetField or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.NonPublic);
|
||||
for var i := 0 to fa.Length - 1 do
|
||||
if {not fa[i].IsStatic and} not fa[i].IsLiteral then
|
||||
|
|
@ -6877,7 +6877,10 @@ begin
|
|||
//result:= Convert.ToString(integer(p), 16);
|
||||
if p = nil then
|
||||
result := 'nil'
|
||||
else result := '$' + integer(p).ToString('X');
|
||||
else if Environment.Is64BitProcess then
|
||||
result := '$' + int64(p).ToString('X')
|
||||
else
|
||||
result := '$' + integer(p).ToString('X')
|
||||
end;
|
||||
|
||||
procedure Exec(filename: string);
|
||||
|
|
|
|||
|
|
@ -6358,7 +6358,7 @@ begin
|
|||
else if t.IsEnum then Result := f.br.ReadInt32
|
||||
else if t.IsValueType then
|
||||
begin
|
||||
elem := Activator.CreateInstance(t);
|
||||
elem := Activator.CreateInstance(t,true);
|
||||
fa := t.GetFields(System.Reflection.BindingFlags.GetField or System.Reflection.BindingFlags.Instance or System.Reflection.BindingFlags.Public or System.Reflection.BindingFlags.NonPublic);
|
||||
for var i := 0 to fa.Length - 1 do
|
||||
if {not fa[i].IsStatic and} not fa[i].IsLiteral then
|
||||
|
|
|
|||
Loading…
Reference in a new issue