Changeset 478 for trunk/Include/com/decimal.ab

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/com/decimal.ab (modified) (5 diffs)

trunk/Include/com/decimal.ab

@@ -1 +1 @@
 ' com/decimal.ab
 
-'#require <oleauto.ab>
 #require <com/variant.ab>
 #require <com/currency.ab>
@@ -14 +13 @@
 
     Sub Decimal(d As Decimal)
-'       dec = d なぜかコンパイルできない
-        memcpy(VarPtr(dec), VarPtr(d.dec), Len(dec))
+        dec = d.dec
     End Sub
 
     Sub Decimal(ByRef d As DECIMAL)
-        memcpy(VarPtr(dec), VarPtr(d), Len(dec))
+        dec = d
     End Sub
 
     Sub Decimal(lo As Long, mid As Long, hi As Long, isNegative As Boolean, scale As Byte)
         If scale > 28 Then
-            Debug
-            Throw New ArgumentOutOfRangeException
+            Throw New ArgumentOutOfRangeException("scale")
         End If
         Dim sign As Byte
@@ -284 +281 @@
         Return c = VARCMP_LT
     End Function
-/*
+
     Const Function Operator >(y As Decimal) As Boolean
         Dim c = Compare(This, y)
@@ -294 +291 @@
         Return c = VARCMP_GT
     End Function
-*/
+
     Const Function Operator <=(y As Decimal) As Boolean
         Dim c = Compare(This, y)
@@ -348 +345 @@
 
     Override Function ToString() As String
-        Dim bs As BSTR
-        VarBstrFromDec(dec, LOCALE_USER_DEFAULT, LOCALE_USE_NLS, bs)
-        ToString = New String(bs As PCWSTR, SysStringLen(bs) As Long)
-        SysFreeString(bs)
+        /*Using*/ Dim bstr = New BString
+            Dim bs As BSTR
+            VarBstrFromDec(dec, LOCALE_USER_DEFAULT, LOCALE_USE_NLS, bs)
+            bstr.Attach(bs)
+            ToString = bstr.ToString
+        bstr.Dispose() 'End Using
     End Function