Tag: cws_src680_sb40 User: sb Date: 05/11/17 23:59:42 Modified: /dba/connectivity/source/drivers/jdbc/ Connection.cxx, ResultSet.cxx, Statement.cxx
Log: #i57855# Changed getCppuType(T const*) from a set of overloads to a set of explicit function template specializations, to work around non-conforming uses of getCppuType in templates (which GCC 4.1 complains about); that change is build-incompatible in cases where getCppuType is used on a non-UNO C++ type that is derived from a UNO type. File Changes: Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: Connection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Connection.cxx?r1=1.23&r2=1.23.30.1 Delta lines: +6 -4 ------------------- --- Connection.cxx 8 Sep 2005 06:09:13 -0000 1.23 +++ Connection.cxx 18 Nov 2005 07:59:39 -0000 1.23.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: Connection.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.23.30.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:09:13 $ + * last change: $Author: sb $ $Date: 2005/11/18 07:59:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -691,7 +691,9 @@ if( out ) { java_sql_SQLWarning_BASE warn_base(t.pEnv, out); - return makeAny(java_sql_SQLWarning(warn_base,*this)); + return makeAny( + static_cast< starsdbc::SQLException >( + java_sql_SQLWarning(warn_base,*this))); } return Any(); File [changed]: ResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/ResultSet.cxx?r1=1.24&r2=1.24.34.1 Delta lines: +6 -4 ------------------- --- ResultSet.cxx 8 Sep 2005 06:12:05 -0000 1.24 +++ ResultSet.cxx 18 Nov 2005 07:59:39 -0000 1.24.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.24.34.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:12:05 $ + * last change: $Author: sb $ $Date: 2005/11/18 07:59:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1142,7 +1142,9 @@ if( out ) { java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); - return makeAny(java_sql_SQLWarning(warn_base,*this)); + return makeAny( + static_cast< starsdbc::SQLException >( + java_sql_SQLWarning(warn_base,*this))); } return ::com::sun::star::uno::Any(); File [changed]: Statement.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/Statement.cxx?r1=1.25&r2=1.25.34.1 Delta lines: +6 -4 ------------------- --- Statement.cxx 8 Sep 2005 06:13:00 -0000 1.25 +++ Statement.cxx 18 Nov 2005 07:59:39 -0000 1.25.34.1 @@ -4,9 +4,9 @@ * * $RCSfile: Statement.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.34.1 $ * - * last change: $Author: rt $ $Date: 2005/09/08 06:13:00 $ + * last change: $Author: sb $ $Date: 2005/11/18 07:59:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -554,7 +554,9 @@ if( out ) { java_sql_SQLWarning_BASE warn_base( t.pEnv, out ); - return makeAny(java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this)); + return makeAny( + static_cast< starsdbc::SQLException >( + java_sql_SQLWarning(warn_base,*(::cppu::OWeakObject*)this))); } return Any(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
