Changeset 478 for trunk/Include/system

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/system/string.sbp (modified) (4 diffs)

trunk/Include/system/string.sbp

@@ -5 +5 @@
 #define _INC_BASIC_STRING
 
-#require <Classes/System/String.ab>
-#require <Classes/System/Text/StringBuilder.ab>
-
-Function StrPtr(s As String) As *StrChar
+Function StrPtr(s As String) As *Char
     If Not ActiveBasic.IsNothing(s) Then
         StrPtr = s.StrPtr
@@ -62 +59 @@
 出力関数: wcs(z)出力GetStr, mbs(z)出力GetStr,
           wcs(z)出力GetStrNT, mbs(z)出力GetStrNT,
-          GetWCStr, GetMBStr, GetTCStr, GetSCStr,
-          ToWCStr, ToMBStr, ToTCStr, ToSCStr
-で、5 * 12 = 60通り。
+          GetWCStr, GetMBStr, GetTCStr,
+          ToWCStr, ToMBStr, ToTCStr,
+で、5 * 10 = 50通り。
 */
 
@@ -261 +258 @@
 End Function
 
-Function GetSCStr(mbszSrc As PSTR, ByRef ssDst As *StrChar) As SIZE_T
-    Return GetStr(mbszSrc, ssDst)
-End Function
-
-Function GetSCStr(mbsSrc As PSTR, len As SIZE_T, ByRef ssDst As *StrChar) As SIZE_T
-    Return GetStr(mbsSrc, len, ssDst)
-End Function
-
-Function GetSCStr(wcszSrc As PWSTR, ByRef ssDst As *StrChar) As SIZE_T
-    Return GetStr(wcszSrc, ssDst)
-End Function
-
-Function GetSCStr(wcsSrc As PWSTR, len As SIZE_T, ByRef ssDst As *StrChar) As SIZE_T
-    Return GetStr(wcsSrc, len, ssDst)
-End Function
-
-Function GetSCStr(strSrc As String, ByRef ssDst As *StrChar) As SIZE_T
-    Return GetStr(strSrc.StrPtr, strSrc.Length As SIZE_T, ssDst)
-End Function
-
 Function ToWCStr(mbsz As PSTR) As PWSTR
     GetStrNT(mbsz, ToWCStr)
@@ -339 +316 @@
 Function ToTCStr(s As String) As PCTSTR
     GetStrNT(s, ToTCStr)
-End Function
-
-Function ToSCStr(mbsz As PSTR) As *StrChar
-    GetStrNT(mbsz, ToSCStr)
-End Function
-
-Function ToSCStr(mbs As PSTR, len As SIZE_T) As *StrChar
-    GetStrNT(mbs, len, ToSCStr)
-End Function
-
-Function ToSCStr(wcsz As PWSTR) As *StrChar
-    GetStrNT(wcsz, ToSCStr)
-End Function
-
-Function ToSCStr(wcs As PWSTR, len As SIZE_T) As *StrChar
-    GetStrNT(wcs, len, ToSCStr)
-End Function
-
-Function ToSCStr(s As String) As *StrChar
-    ToSCStr = StrPtr(s)
 End Function