User: hr Date: 06/06/19 18:57:32 Modified: /dba/connectivity/source/inc/ OColumn.hxx
Log: INTEGRATION: CWS warnings01 (1.3.30); FILE MERGED 2005/11/16 12:59:22 fs 1.3.30.2: #i57457# warning free code 2005/11/07 14:44:05 fs 1.3.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/inc/ ======================================== File [changed]: OColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/OColumn.hxx?r1=1.3&r2=1.4 Delta lines: +7 -7 ------------------- --- OColumn.hxx 8 Sep 2005 06:37:43 -0000 1.3 +++ OColumn.hxx 20 Jun 2006 01:57:30 -0000 1.4 @@ -36,8 +36,8 @@ #ifndef _CONNECTIVITY_COLUMN_HXX_ #define _CONNECTIVITY_COLUMN_HXX_ -#ifndef _RTL_USTRING_ -#include <rtl/ustring> +#ifndef _RTL_USTRING_HXX_ +#include <rtl/ustring.hxx> #endif #ifndef _SAL_TYPES_H_ #include <sal/types.h> @@ -120,11 +120,11 @@ inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } - inline static void * SAL_CALL operator new( size_t nSize,void* _pHint ) SAL_THROW( () ) + inline static void * SAL_CALL operator new( size_t ,void* _pHint ) SAL_THROW( () ) { return _pHint; } inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) { ::rtl_freeMemory( pMem ); } - inline static void SAL_CALL operator delete( void * pMem,void* _pHint ) SAL_THROW( () ) + inline static void SAL_CALL operator delete( void *,void* ) SAL_THROW( () ) { } sal_Bool isAutoIncrement() const { return m_AutoIncrement; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
