From 6ad87ecf54bdc0ebe5fd59896acf5a373860229c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 15 Jan 2007 12:35:51 +0000 Subject: INTEGRATION: CWS dba22b (1.29.36); FILE MERGED 2006/12/13 08:49:25 fs 1.29.36.1: renamed Statement.* to JStatement.*, to prevent debugger conflicts with dbaccess-located files with the same name --- connectivity/source/drivers/jdbc/ResultSet.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 6f81acbbf273..87ff0f4b1ea0 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ResultSet.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: obo $ $Date: 2006-10-12 11:30:51 $ + * last change: $Author: vg $ $Date: 2007-01-15 13:35:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,7 +39,7 @@ #include "java/sql/ResultSet.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_STATEMENT_HXX_ -#include "java/sql/Statement.hxx" +#include "java/sql/JStatement.hxx" #endif #ifndef _CONNECTIVITY_JAVA_SQL_SQLWARNING_HXX_ #include "java/sql/SQLWarning.hxx" -- cgit