usa	2008-04-22 09:58:51 +0900 (Tue, 22 Apr 2008)

  New Revision: 16130

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32ole/win32ole.c

  Log:
    * ext/win32ole/win32ole.c: avoid warnings.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16130&r2=16129&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/win32ole/win32ole.c?r1=16130&r2=16129&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16129)
+++ ChangeLog	(revision 16130)
@@ -1,3 +1,7 @@
+Tue Apr 22 09:58:13 2008  NAKAMURA Usaku  <usa@r...>
+
+	* ext/win32ole/win32ole.c: avoid warnings.
+
 Tue Apr 22 09:56:51 2008  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (eaccess): workaround for recent msvcrt's behavior.
Index: ext/win32ole/win32ole.c
===================================================================
--- ext/win32ole/win32ole.c	(revision 16129)
+++ ext/win32ole/win32ole.c	(revision 16130)
@@ -1326,13 +1326,13 @@
     if ((vt & ~VT_BYREF) == VT_ARRAY) {
         vt = (vt | VT_VARIANT);
     }
-    psa = SafeArrayCreate(vt & VT_TYPEMASK, dim, psab);
+    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
     if (psa == NULL)
         hr = E_OUTOFMEMORY;
     else
         hr = SafeArrayLock(psa);
     if (SUCCEEDED(hr)) {
-        ole_set_safe_array(dim-1, psa, pid, pub, val, dim, vt & VT_TYPEMASK);
+        ole_set_safe_array(dim-1, psa, pid, pub, val, dim, (VARTYPE)(vt & VT_TYPEMASK));
         hr = SafeArrayUnlock(psa);
     }
 
@@ -1643,7 +1643,7 @@
                 V_ARRAYREF(&(pvar->var)) = &(V_ARRAY(&(pvar->realvar)));
             }
         } else {
-            hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (vt & ~VT_BYREF));
+            hr = ole_val_ary2variant_ary(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
             if (SUCCEEDED(hr)) {
                 if (vt & VT_BYREF) {
                     V_VT(&(pvar->var)) = vt;
@@ -1674,7 +1674,7 @@
                 }
             }
         } else {
-            ole_val2variant_ex(val, &(pvar->realvar), (vt & ~VT_BYREF));
+            ole_val2variant_ex(val, &(pvar->realvar), (VARTYPE)(vt & ~VT_BYREF));
             if (vt == (VT_BYREF | VT_VARIANT)) {
                 ole_set_byref(&(pvar->realvar), &(pvar->var), vt);
             } else if (vt & VT_BYREF) {
@@ -7752,7 +7752,7 @@
         psab[i].lLbound = 0;
     }
 
-    psa = SafeArrayCreate(vt & VT_TYPEMASK, dim, psab);
+    psa = SafeArrayCreate((VARTYPE)(vt & VT_TYPEMASK), dim, psab);
     if (psa == NULL) {
         if (psab) free(psab);
         rb_raise(rb_eRuntimeError, "memory allocation error(SafeArrayCreate)");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/