From bd6310886dc4351a8ac3ed3ee9a4f65d2a0e005c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sat, 10 Mar 2012 18:40:30 +0100 Subject: [PATCH] WaE: enumeral and non-enumeral type in conditional expression --- connectivity/source/drivers/ado/AResultSet.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 049947670c38..3c83cc0acad3 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -285,7 +285,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) PositionEnum_Param aPos; m_pRecordSet->get_AbsolutePosition(&aPos); - return (aPos > 0) ? aPos : m_nRowPos; + return (aPos > 0) ? static_cast(aPos) : m_nRowPos; // return the rowcount from driver if the driver doesn't support this return our count } // -------------------------------------------------------------------------