[Libreoffice-commits] core.git: connectivity/source

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/ado/AStatement.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 187a6f5d2dfd8a94708cedea992aa551074726a4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 4 11:40:38 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 4 14:23:47 2020 +0200

    Silence -Werror,-Wdeprecated-enum-enum-conversion (clang-cl)
    
    "bitwise operation between different enumeration types ('CommandTypeEnum' and
    'ExecuteOptionEnum')", but where <https://docs.microsoft.com/en-us/sql/ado/
    reference/ado-api/execute-method-ado-connection?view=sql-server-ver15> documents
    parameter Options as "A Long [...] Can be a bitmask of one or more
    CommandTypeEnum or ExecuteOptionEnum values."
    
    Change-Id: If000490127e7215863ea750a3f9f30e69916978e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100070
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 01fea934cd19..6f2c14617e0e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -396,7 +396,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql )
     try {
         ADORecordset* pSet = nullptr;
         CHECK_RETURN(m_Command.put_CommandText(sql))
-        CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,adCmdText|adExecuteNoRecords,&pSet))
+        CHECK_RETURN(m_Command.Execute(m_RecordsAffected,m_Parameters,long(adCmdText)|long(adExecuteNoRecords),&pSet))
     }
     catch (SQLWarning& ex) {