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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/com/currency.ab (modified) (8 diffs)

trunk/Include/com/currency.ab

@@ -2 +2 @@
 
 #require <com/variant.ab>
-
-#ifndef _COM_CURRENCY_AB
-#define _COM_CURRENCY_AB
 
 Namespace ActiveBasic
@@ -56 +53 @@
         Return ret
     End Function
-/*
+
     Const Function Operator /(y As Variant) As Double
         Dim vx = New Variant(This)
@@ -69 +66 @@
         Return ret.ValR8
     End Function
-*/
+
     Const Function Operator +(y As Currency) As Currency
         Dim ret = New Currency
@@ -131 +128 @@
         Return c = VARCMP_LT
     End Function
-/*
+
     Const Function Operator >(y As Currency) As Boolean
         Dim c = Compare(This, y)
@@ -141 +138 @@
         Return c = VARCMP_GT
     End Function
-*/
+
     Const Function Operator <=(y As Currency) As Boolean
         Dim c = Compare(This, y)
@@ -183 +180 @@
 
     Const Function Cy() As CY
-        Return cy
+        Cy = cy
     End Function
 
@@ -203 +200 @@
 
     Override Function ToString() As String
-        Dim bs As BSTR
-        VarBstrFromCy(cy, 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
+            VarBstrFromCy(cy, LOCALE_USER_DEFAULT, LOCALE_USE_NLS, bs)
+            bstr.Attach(bs)
+            ToString = bstr.ToString
+        bstr.Dispose() 'End Using
     End Function
 
@@ -223 +222 @@
 End Namespace 'COM
 End Namespace 'ActiveBasic
-
-#endif '_COM_CURRENCY_AB