فهرست منبع

* Change some methods from using var to using out (bug ID 37376)

git-svn-id: trunk@46533 -
michael 5 سال پیش
والد
کامیت
213d2905df
8فایلهای تغییر یافته به همراه20 افزوده شده و 20 حذف شده
  1. 2 2
      rtl/inc/dynlib.inc
  2. 2 2
      rtl/inc/dynlibh.inc
  3. 3 3
      rtl/inc/thread.inc
  4. 3 3
      rtl/inc/threadh.inc
  5. 4 4
      rtl/inc/ustringh.inc
  6. 4 4
      rtl/inc/ustrings.inc
  7. 1 1
      rtl/inc/variant.inc
  8. 1 1
      rtl/inc/varianth.inc

+ 2 - 2
rtl/inc/dynlib.inc

@@ -127,7 +127,7 @@ begin
   Result:=GetProcedureAddress(Lib,Procname);
 end;
 
-Procedure GetDynLibsManager (Var Manager : TDynLibsManager);
+Procedure GetDynLibsManager (Out Manager : TDynLibsManager);
 begin
   Manager:=CurrentDLM;
 end;
@@ -138,7 +138,7 @@ begin
 end;
 
 
-Procedure SetDynLibsManager (Const New : TDynLibsManager; Var Old: TDynLibsManager);
+Procedure SetDynLibsManager (Const New : TDynLibsManager; Out Old: TDynLibsManager);
 begin
   Old:=CurrentDLM;
   CurrentDLM:=New;

+ 2 - 2
rtl/inc/dynlibh.inc

@@ -61,7 +61,7 @@ Function GetLoadErrorStr: string;
 Function FreeLibrary(Lib : TLibHandle) : Boolean; inline;
 Function GetProcAddress(Lib : TlibHandle; const ProcName : AnsiString) : {$ifdef cpui8086}FarPointer{$else}Pointer{$endif}; inline;
 
-Procedure GetDynLibsManager (Var Manager : TDynLibsManager);
+Procedure GetDynLibsManager (Out Manager : TDynLibsManager);
 Procedure SetDynLibsManager (Const New : TDynLibsManager);
-Procedure SetDynLibsManager (Const New : TDynLibsManager; Var Old: TDynLibsManager);
+Procedure SetDynLibsManager (Const New : TDynLibsManager; out Old: TDynLibsManager);
 

+ 3 - 3
rtl/inc/thread.inc

@@ -224,7 +224,7 @@ begin
 end;
 {$endif FPC_HAS_FEATURE_UNICODESTRINGS}
 
-procedure InitCriticalSection(var cs : TRTLCriticalSection);
+procedure InitCriticalSection(out cs : TRTLCriticalSection);
 
 begin
   CurrentTM.InitCriticalSection(cs);
@@ -254,14 +254,14 @@ begin
   CurrentTM.LeaveCriticalSection(cs);
 end;
 
-Function GetThreadManager(Var TM : TThreadManager) : Boolean;
+Function GetThreadManager(Out TM : TThreadManager) : Boolean;
 
 begin
   TM:=CurrentTM;
   Result:=True;
 end;
 
-Function SetThreadManager(Const NewTM : TThreadManager; Var OldTM : TThreadManager) : Boolean;
+Function SetThreadManager(Const NewTM : TThreadManager; Out OldTM : TThreadManager) : Boolean;
 
 begin
   GetThreadManager(OldTM);

+ 3 - 3
rtl/inc/threadh.inc

@@ -113,8 +113,8 @@ type
 *****************************************************************************}
 
 
-Function GetThreadManager(Var TM : TThreadManager) : Boolean;
-Function SetThreadManager(Const NewTM : TThreadManager; Var OldTM : TThreadManager) : Boolean;
+Function GetThreadManager(Out TM : TThreadManager) : Boolean;
+Function SetThreadManager(Const NewTM : TThreadManager; Out OldTM : TThreadManager) : Boolean;
 Function SetThreadManager(Const NewTM : TThreadManager) : Boolean;
 {$ifndef DISABLE_NO_THREAD_MANAGER}
 {$endif DISABLE_NO_THREAD_MANAGER}
@@ -165,7 +165,7 @@ procedure SetThreadDebugName(threadHandle: TThreadID; const ThreadName: UnicodeS
 { this allows to do a lot of things in MT safe way }
 { it is also used to make the heap management      }
 { thread safe                                      }
-procedure InitCriticalSection(var cs : TRTLCriticalSection);
+procedure InitCriticalSection(out cs : TRTLCriticalSection);
 procedure DoneCriticalSection(var cs : TRTLCriticalSection);
 procedure EnterCriticalSection(var cs : TRTLCriticalSection);
 procedure LeaveCriticalSection(var cs : TRTLCriticalSection);

+ 4 - 4
rtl/inc/ustringh.inc

@@ -156,13 +156,13 @@ function WideStringToUCS4String(const s : WideString) : UCS4String;
 function UCS4StringToWideString(const s : UCS4String) : WideString;
 {$endif FPC_HAS_FEATURE_DYNARRAYS}
 
-Procedure GetWideStringManager (Var Manager : TUnicodeStringManager);
+Procedure GetWideStringManager (Out Manager : TUnicodeStringManager);
 Procedure SetWideStringManager (Const New : TUnicodeStringManager);
-Procedure SetWideStringManager (Const New : TUnicodeStringManager; Var Old: TUnicodeStringManager);
+Procedure SetWideStringManager (Const New : TUnicodeStringManager; Out Old: TUnicodeStringManager);
 
-Procedure GetUnicodeStringManager (Var Manager : TUnicodeStringManager);
+Procedure GetUnicodeStringManager (Out Manager : TUnicodeStringManager);
 Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager);
-Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Var Old: TUnicodeStringManager);
+Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Out Old: TUnicodeStringManager);
 
 function StringElementSize(const S : UnicodeString): Word; overload;
 function StringRefCount(const S : UnicodeString): SizeInt; overload;

+ 4 - 4
rtl/inc/ustrings.inc

@@ -131,13 +131,13 @@ function DefaultGetStandardCodePage(const stdcp: TStandardCodePageEnum): TSystem
       Result:=DefaultFileSystemCodePage
   end;
 
-Procedure GetUnicodeStringManager (Var Manager : TUnicodeStringManager);
+Procedure GetUnicodeStringManager (Out Manager : TUnicodeStringManager);
 begin
   manager:=widestringmanager;
 end;
 
 
-Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Var Old: TUnicodeStringManager);
+Procedure SetUnicodeStringManager (Const New : TUnicodeStringManager; Out Old: TUnicodeStringManager);
 begin
   Old:=widestringmanager;
   widestringmanager:=New;
@@ -150,13 +150,13 @@ begin
 end;
 
 
-Procedure GetWideStringManager (Var Manager : TUnicodeStringManager);
+Procedure GetWideStringManager (out Manager : TUnicodeStringManager);
 begin
   manager:=widestringmanager;
 end;
 
 
-Procedure SetWideStringManager (Const New : TUnicodeStringManager; Var Old: TUnicodeStringManager);
+Procedure SetWideStringManager (Const New : TUnicodeStringManager; Out old: TUnicodeStringManager);
 begin
   Old:=widestringmanager;
   widestringmanager:=New;

+ 1 - 1
rtl/inc/variant.inc

@@ -1101,7 +1101,7 @@ function Null: Variant;       // Null standard constant
                       Variant manager functions
  **********************************************************************}
 
-procedure GetVariantManager(var VarMgr: TVariantManager);
+procedure GetVariantManager(out VarMgr: TVariantManager);
 begin
   VarMgr:=VariantManager;
 end;

+ 1 - 1
rtl/inc/varianth.inc

@@ -214,7 +214,7 @@ type
    end;
    pvariantmanager = ^tvariantmanager;
 
-procedure GetVariantManager(var VarMgr: TVariantManager);
+procedure GetVariantManager(Out VarMgr: TVariantManager);
 procedure SetVariantManager(const VarMgr: TVariantManager);
 
 { Global constants. Needed here only for compatibility. }