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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 30 21:00:28 UTC 2019


 connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 654bbb9559dc4dfbd3dfc56f15fcedae9e8d5a27
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Jan 30 14:33:46 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jan 30 21:59:59 2019 +0100

    Fix type of MySqlFieldInfo::mysql_type to avoid -Wc++11-narrowing (clang-cl)
    
    ...at
    
    > connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx(45,13):  error: non-constant-expression cannot be narrowed from type 'enum enum_field_types' to 'unsigned int' in initializer list [-Wc++11-narrowing]
    >             fields[i].type, // mysql_type
    >             ^~~~~~~~~~~~~~
    
    Change-Id: I3439ca06b9dd6efb24931203f7c7842e430f034c
    Reviewed-on: https://gerrit.libreoffice.org/67141
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
index a7de887bd78d..52ca9595b9ba 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
@@ -42,7 +42,7 @@ struct MySqlFieldInfo
     OUString columnName;
     sal_Int32 length = 0;
     sal_Int32 type = 0;
-    unsigned mysql_type = 0;
+    enum_field_types mysql_type = {};
     unsigned charsetNumber = 0;
     unsigned flags = 0;
     OUString schemaName;


More information about the Libreoffice-commits mailing list