Browse Source

* use CodePointer in Classes.TReader.FindMethod() and TFindMethodEvent for i8086 medium memory model compatibility

git-svn-id: trunk@25153 -
nickysn 12 years ago
parent
commit
4953fd0bb0
2 changed files with 3 additions and 3 deletions
  1. 2 2
      rtl/objpas/classes/classesh.inc
  2. 1 1
      rtl/objpas/classes/reader.inc

+ 2 - 2
rtl/objpas/classes/classesh.inc

@@ -1185,7 +1185,7 @@ type
 
 
 
 
   TFindMethodEvent = procedure(Reader: TReader; const MethodName: string;
   TFindMethodEvent = procedure(Reader: TReader; const MethodName: string;
-    var Address: Pointer; var Error: Boolean) of object;
+    var Address: CodePointer; var Error: Boolean) of object;
   TSetMethodPropertyEvent = procedure(Reader: TReader; Instance: TPersistent;
   TSetMethodPropertyEvent = procedure(Reader: TReader; Instance: TPersistent;
     PropInfo: PPropInfo; const TheMethodName: string;
     PropInfo: PPropInfo; const TheMethodName: string;
     var Handled: boolean) of object;
     var Handled: boolean) of object;
@@ -1234,7 +1234,7 @@ type
     function FindComponentClass(const AClassName: string): TComponentClass;
     function FindComponentClass(const AClassName: string): TComponentClass;
   protected
   protected
     function Error(const Message: string): Boolean; virtual;
     function Error(const Message: string): Boolean; virtual;
-    function FindMethod(ARoot: TComponent; const AMethodName: string): Pointer; virtual;
+    function FindMethod(ARoot: TComponent; const AMethodName: string): CodePointer; virtual;
     procedure ReadProperty(AInstance: TPersistent);
     procedure ReadProperty(AInstance: TPersistent);
     procedure ReadPropValue(Instance: TPersistent; PropInfo: Pointer);
     procedure ReadPropValue(Instance: TPersistent; PropInfo: Pointer);
     procedure PropertyError;
     procedure PropertyError;

+ 1 - 1
rtl/objpas/classes/reader.inc

@@ -656,7 +656,7 @@ begin
     FOnError(Self, Message, Result);
     FOnError(Self, Message, Result);
 end;
 end;
 
 
-function TReader.FindMethod(ARoot: TComponent; const AMethodName: String): Pointer;
+function TReader.FindMethod(ARoot: TComponent; const AMethodName: String): CodePointer;
 var
 var
   ErrorResult: Boolean;
   ErrorResult: Boolean;
 begin
 begin