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

Andrzej J.R. Hunt andrzej at ahunt.org
Fri Jul 19 12:07:16 PDT 2013


 connectivity/source/drivers/firebird/FResultSetMetaData.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4eb1ac0b7aa680c6128b866e15fccf29c6c2882d
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Fri Jul 19 21:00:33 2013 +0200

    Fix "error: control may reach end of non-void function".
    
    (Mac seems to complain despite assert(false) being present in the only
    non-returning branch.)
    
    Change-Id: I2bd71cdfd47e435741d8fcbcecdf06767aebdd6b

diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
index 06829d2..30d351e 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
@@ -110,6 +110,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column)
             return 0;       // TODO: verify
         default:
             assert(false); // Should never happen
+            return 0;
     }
 }
 


More information about the Libreoffice-commits mailing list