diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 00:58:51 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 00:58:51 +0000 |
| commit | 11fbd724cc14895ad17e015ba5f0ab967ca3b35d (patch) | |
| tree | bdaecf77090d9a99457c12aecf1bed3f8041ad04 | |
| parent | 915b5c55084762d88ace671c6d255a5f7d2ba8ca (diff) | |
* ext/win32ole/win32ole.c: avoid warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 10 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Tue Apr 22 09:58:13 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/win32ole/win32ole.c: avoid warnings. + Tue Apr 22 09:56:51 2008 NAKAMURA Usaku <usa@ruby-lang.org> * file.c (eaccess): workaround for recent msvcrt's behavior. diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 3df2506b77..bb9098f258 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -1326,13 +1326,13 @@ ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt) 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 @@ ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar) 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 @@ ole_val2olevariantdata(VALUE val, VARTYPE vt, struct olevariantdata *pvar) } } } 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 @@ folevariant_s_array(VALUE klass, VALUE elems, VALUE vvt) 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)"); |