INTEGRATION: CWS ooo20031216 (1.10.34); FILE MERGED

2003/12/15 09:16:44 waratah 1.10.34.1: #i1858# replace some NULL constants with 0 (zero),  used with non-pointers
This commit is contained in:
Jens-Heiner Rechtien 2004-02-04 12:54:34 +00:00
parent ca4b9be53c
commit 6eec85d679

View file

@ -2,9 +2,9 @@
*
* $RCSfile: odbcconfig.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: hjs $ $Date: 2003-08-18 15:05:03 $
* last change: $Author: hr $ $Date: 2004-02-04 13:54:34 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -191,7 +191,7 @@ struct OdbcTypesImpl
{
#ifdef HAVE_ODBC_SUPPORT
SQLHANDLE hEnvironment;
OdbcTypesImpl() : hEnvironment(NULL) { }
OdbcTypesImpl() : hEnvironment(0) { }
#else
void* pDummy;
#endif
@ -266,7 +266,7 @@ void OOdbcEnumeration::freeEnv()
#ifdef HAVE_ODBC_SUPPORT
if (m_pImpl->hEnvironment)
NSQLFreeHandle(SQL_HANDLE_ENV, m_pImpl->hEnvironment);
m_pImpl->hEnvironment =NULL;
m_pImpl->hEnvironment = 0;
#endif
}