diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:08:40 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 01:08:40 +0000 |
commit | dc585223d837f6f0fe8de7cf4e97384f2e0c22ef (patch) | |
tree | 3d686b434b143a64633e3c8f7314c2e60a478ba0 /connectivity/source/parse/sqlflex.l | |
parent | 9e60bd44dd9368c4b9efe417394b60ffdae115aa (diff) |
INTEGRATION: CWS warnings01 (1.27.68); FILE MERGED
2006/04/07 20:25:22 sb 1.27.68.3: RESYNC: (1.27-1.28); FILE MERGED
2005/11/21 10:08:01 fs 1.27.68.2: #i57457# warning-free code on unx*
2005/11/07 14:44:13 fs 1.27.68.1: #i57457# warning-free code
Diffstat (limited to 'connectivity/source/parse/sqlflex.l')
-rw-r--r-- | connectivity/source/parse/sqlflex.l | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index b1c5c6fadaf1..11373c8e6cbf 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -2,7 +2,7 @@ //-------------------------------------------------------------------------- // -// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.28 2005-09-23 11:42:24 hr Exp $ +// $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/connectivity/source/parse/sqlflex.l,v 1.29 2006-06-20 02:08:40 hr Exp $ // // Copyright 2000 Sun Microsystems, Inc. All Rights Reserved. // @@ -10,7 +10,7 @@ // OJ // // Last change: -// $Author: hr $ $Date: 2005-09-23 11:42:24 $ $Revision: 1.28 $ +// $Author: hr $ $Date: 2006-06-20 02:08:40 $ $Revision: 1.29 $ // // Description: // @@ -49,6 +49,15 @@ #ifndef _CONNECTIVITY_SQLPARSE_HXX #include <connectivity/sqlparse.hxx> #endif + +#if defined __GNUC__ + #pragma GCC system_header +#elif defined __SUNPRO_CC +#pragma disable_warn +#elif defined _MSC_VER +#pragma warning(push, 1) +#endif + using namespace connectivity; //============================================================================= @@ -519,6 +528,8 @@ sal_Int32 mapEnumToToken(IParseContext::InternationalKeyCode _eKeyCode ) case IParseContext::KEY_MAX: nTokenID = SQL_TOKEN_MAX; break; case IParseContext::KEY_MIN: nTokenID = SQL_TOKEN_MIN; break; case IParseContext::KEY_SUM: nTokenID = SQL_TOKEN_SUM; break; + default: + OSL_ENSURE( false, "mapEnumToToken: unsupported key!" ); } return nTokenID; } @@ -733,3 +744,8 @@ sal_Int32 OSQLScanner::SQLlex() return SQLyylex(); } +#if defined __SUNPRO_CC +#pragma enable_warn +#elif defined _MSC_VER +#pragma warning(pop) +#endif |