Changeset 478 for trunk/Include/Classes

Timestamp:

Mar 13, 2008, 9:06:43 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

現在向けに修正（参照型のポインタの排除など）

Location:

trunk/Include/Classes

Files:

• ActiveBasic/Strings/Strings.ab (modified) (2 diffs)
• System/String.ab (modified) (1 diff)

trunk/Include/Classes/ActiveBasic/Strings/Strings.ab

@@ -1 +1 @@
 'Classes/ActiveBasic/Strings/Strings.ab
-
-#ifndef __ACTIVEBASIC_STRINGS_STRINGS_AB__
-#define __ACTIVEBASIC_STRINGS_STRINGS_AB__
-
-#require <Classes/System/Math.ab>
-#require <Classes/System/Collections/ArrayList.ab>
 
 Namespace ActiveBasic
@@ -220 +214 @@
 End Namespace 'ActiveBasic
 
-#endif '__ACTIVEBASIC_STRINGS_STRINGS_AB__

trunk/Include/Classes/System/String.ab

@@ -256 +256 @@
 
         Override Function Equals(s As Object) As Boolean
-            If Object.Equals( This.GetType(), s.GetType() ) Then
-                Return This.Equals(s As String)
+            If Not ActiveBasic.IsNothing(s) Then
+                If Object.Equals(This.GetType(), s.GetType()) Then
+                    Return This.Equals(s As String)
+                End If
             End If
             Return False