diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-04 18:51:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-10-04 18:51:13 +0300 |
| commit | 1967376c7b3072fefb6f74566cfa70fd03b9bd04 (patch) | |
| tree | bf9d933dfe81f67b986937a7efd992d7619328a1 /connectivity | |
| parent | 67a565eabf3dcbf7a76dd4a6b9ab139274fa3da7 (diff) | |
WaE: deletion of pointer to incomplete type; no destructor called
Move the struct OSQLParser_Data definition to the sqlparse.hxx
header. A somewhat ugly workaround for warning C4150: deletion of
pointer to incomplete type 'connectivity::OSQLParser_Data'; no
destructor called.
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/inc/connectivity/sqlparse.hxx | 13 | ||||
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 1d7f128bba1d..8339d20459bf 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -44,6 +44,7 @@ #include <com/sun/star/i18n/XLocaleData.hpp> #include "connectivity/IParseContext.hxx" #include "connectivity/dbtoolsdllapi.hxx" +#include "connectivity/sqlerror.hxx" #include <salhelper/singletonref.hxx> #include <osl/mutex.hxx> @@ -127,7 +128,17 @@ namespace connectivity //========================================================================== //= OSQLParser //========================================================================== - struct OSQLParser_Data; + struct OSQLParser_Data + { + ::com::sun::star::lang::Locale aLocale; + ::connectivity::SQLError aErrors; + + OSQLParser_Data( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xServiceFactory ) + :aErrors( _xServiceFactory ) + { + } + }; + /** Parser for SQL92 */ class OOO_DLLPUBLIC_DBTOOLS OSQLParser diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 599128dd5936..f9789002828f 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -68,7 +68,6 @@ #include <comphelper/stl_types.hxx> #include "connectivity/dbtools.hxx" #include "connectivity/dbmetadata.hxx" -#include "connectivity/sqlerror.hxx" #include <tools/diagnose_ex.h> #include <string.h> #include <boost/bind.hpp> @@ -154,18 +153,6 @@ namespace connectivity { //============================================================================= -struct OSQLParser_Data -{ - ::com::sun::star::lang::Locale aLocale; - ::connectivity::SQLError aErrors; - - OSQLParser_Data( const Reference< XMultiServiceFactory >& _xServiceFactory ) - :aErrors( _xServiceFactory ) - { - } -}; - -//============================================================================= //= SQLParseNodeParameter //============================================================================= //----------------------------------------------------------------------------- |