Changeset 237 for Include/system

Timestamp:

May 7, 2007, 4:22:52 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

#_fullcompileで検出されたエラーの修正（明らかに判るもののみ）

Location:

Include/system

Files:

• exception.ab (modified) (1 diff)
• gc.sbp (modified) (1 diff)
• string.sbp (modified) (9 diffs)

Include/system/exception.ab

@@ -82 +82 @@
         '新しいip, spをセット
 #ifdef _WIN64
-        context.Rip = ppTryLayers[nTryLayers - 1]->AddressOfCatch
+        context.Rip = ppTryLayers[nTryLayers - 1]->AddressOfCatch As QWord
         context.Rsp = ppTryLayers[nTryLayers - 1]->StackPtr
 #else
-        context.Eip = ppTryLayers[nTryLayers - 1]->AddressOfCatch
+        context.Eip = ppTryLayers[nTryLayers - 1]->AddressOfCatch As DWord
         context.Esp = ppTryLayers[nTryLayers - 1]->StackPtr
 #endif

Include/system/gc.sbp

@@ -245 +245 @@
 
     Static Function IsNull( object As Object ) As Boolean
-        If ObjPtr( object ) = NULL Then
-            Return True
-        End If
-        Return False
+        Return Object.ReferenceEquals(object, Nothing)
     End Function
 

Include/system/string.sbp

@@ -92 +92 @@
 End Function
 
-Function GetStr(ByRef s As String, ByRef mbs As PSTR) As SIZE_T
+Function GetStr(s As String, ByRef mbs As PSTR) As SIZE_T
     Return GetStr(s.Chars, s.Length As SIZE_T, mbs)
 End Function
 
-Function GetStr(ByRef s As String, ByRef wcs As PWSTR) As SIZE_T
+Function GetStr(s As String, ByRef wcs As PWSTR) As SIZE_T
     Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function
@@ -116 +116 @@
 End Function
 
-Function GetWCStr(ByRef s As String, ByRef wcs As PWSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length, wcs)
+Function GetWCStr(s As String, ByRef wcs As PWSTR) As SIZE_T
+    Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function
 
@@ -136 +136 @@
 End Function
 
-Function GetMBStr(ByRef s As String, ByRef mbs As PSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length, mbs)
+Function GetMBStr(s As String, ByRef mbs As PSTR) As SIZE_T
+    Return GetStr(s.Chars, s.Length As SIZE_T, mbs)
 End Function
 
@@ -156 +156 @@
 End Function
 
-Function GetTCStr(ByRef s As String, ByRef wcs As PCTSTR) As SIZE_T
+Function GetTCStr(s As String, ByRef tcs As PCTSTR) As SIZE_T
     Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function
@@ -176 +176 @@
 End Function
 
-Function GetSCStr(ByRef s As String, ByRef wcs As *StrChar) As SIZE_T
+Function GetSCStr(s As String, ByRef ss As *StrChar) As SIZE_T
     Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function
@@ -196 +196 @@
 End Function
 
-Function ToWCStr(ByRef s As String) As PWSTR
+Function ToWCStr(s As String) As PWSTR
     GetStr(s.Chars, s.Length As SIZE_T, ToWCStr)
 End Function
@@ -216 +216 @@
 End Function
 
-Function ToMBStr(ByRef s As String) As PSTR
+Function ToMBStr(s As String) As PSTR
     GetStr(s.Chars, s.Length As SIZE_T, ToMBStr)
 End Function
@@ -236 +236 @@
 End Function
 
-Function ToTCStr(ByRef s As String) As PCTSTR
+Function ToTCStr(s As String) As PCTSTR
     GetStr(s.Chars, s.Length As SIZE_T, ToTCStr)
 End Function
@@ -256 +256 @@
 End Function
 
-Function ToSCStr(ByRef s As String) As *StrChar
+Function ToSCStr(s As String) As *StrChar
     GetStr(s.Chars, s.Length As SIZE_T, ToSCStr)
 End Function