Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 41549 invoked from network); 8 Aug 2009 08:33:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 8 Aug 2009 08:33:03 -0000 Received: (qmail 61908 invoked by uid 500); 8 Aug 2009 08:33:10 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 61802 invoked by uid 500); 8 Aug 2009 08:33:10 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 61793 invoked by uid 99); 8 Aug 2009 08:33:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Aug 2009 08:33:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Aug 2009 08:33:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AA59423888EC; Sat, 8 Aug 2009 08:32:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r802320 - /commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp Date: Sat, 08 Aug 2009 08:32:45 -0000 To: commits@commons.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090808083245.AA59423888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mturk Date: Sat Aug 8 08:32:45 2009 New Revision: 802320 URL: http://svn.apache.org/viewvc?rev=802320&view=rev Log: Use C++ casting operators in C++ code Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp?rev=802320&r1=802319&r2=802320&view=diff ============================================================================== --- commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/variant.cpp Sat Aug 8 08:32:45 2009 @@ -171,7 +171,7 @@ return V_I8(v); break; case VT_UI8: - return (jlong)V_I8(v); + return static_castV_I8(v); break; case VT_INT: return V_INT(v); @@ -180,10 +180,10 @@ return V_UINT(v); break; case VT_R4: - return (jlong)(V_R4(v)); + return static_cast(V_R4(v)); break; case VT_R8: - return (jlong)(V_R8(v)); + return static_cast(V_R8(v)); break; case VT_CY: return V_CY(v).int64; @@ -192,7 +192,7 @@ return V_ERROR(v); break; case VT_DATE: - return (jlong)V_DATE(v); + return static_castV_DATE(v); break; case VT_BSTR: return SysStringLen(V_BSTR(v)); @@ -239,10 +239,10 @@ return V_UI4(v); break; case VT_I8: - return (double)V_I8(v); + return static_castV_I8(v); break; case VT_UI8: - return (double)((jlong)V_I8(v)); + return static_cast(V_I8(v)); break; case VT_INT: return V_INT(v); @@ -251,13 +251,13 @@ return V_UINT(v); break; case VT_R4: - return (double)V_R4(v); + return static_castV_R4(v); break; case VT_R8: return V_R8(v); break; case VT_CY: - return (double)V_CY(v).int64; + return static_cast(V_CY(v).int64); break; case VT_ERROR: return V_ERROR(v); @@ -283,10 +283,10 @@ case VT_NULL: break; case VT_EMPTY: - s = _E->NewString((const jchar *)L"", 0); + s = _E->NewString(reinterpret_cast(L""), 0); break; case VT_BSTR: - s = _E->NewString((const jchar *)V_BSTR(v), SysStringLen(V_BSTR(v))); + s = _E->NewString(reinterpret_castV_BSTR(v), SysStringLen(V_BSTR(v))); break; default: VariantInit(&c); @@ -294,7 +294,7 @@ VARIANT_ALPHABOOL | VARIANT_NOUSEROVERRIDE, VT_BSTR); if (SUCCEEDED(r)) { - s = _E->NewString((const jchar *)V_BSTR(&c), SysStringLen(V_BSTR(&c))); + s = _E->NewString(reinterpret_castV_BSTR(&c), SysStringLen(V_BSTR(&c))); VariantClear(&c); } else {