diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-10 16:11:17 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-07-10 16:14:05 +0200 |
| commit | 412c67a916af39dbad674d02428463463d3e05b4 (patch) | |
| tree | d4c9ea5c9aafe135c4771119cf2a666d966bb7a2 | |
| parent | 1e744d5d9de568aeef6794365dc6f2bf84537ddb (diff) | |
fix doubly-defined aEmptyStr with Bison 2.3
Change-Id: Ia54673f3e689a49b3e9101ae4cf5b57f1e68f592
| -rw-r--r-- | connectivity/source/parse/sqlflex.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 7f8cf3e9782d..675c1319fbd1 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -67,7 +67,7 @@ using namespace connectivity; // Erzeugung der Blaetter fuer die Token // Blaetter werden generell vom Lexer erzeugt -static ::rtl::OUString aEmptyString; +static const ::rtl::OUString aEmptyStr; static sal_Int32 gatherString(int delim, sal_Int32 nTyp); static sal_Int32 gatherName(const sal_Char*); @@ -79,7 +79,7 @@ OSQLScanner* xxx_pGLOBAL_SQLSCAN = NULL; SQLyylval.pParseNode = new OSQLInternalNode(text, token); #define SQL_NEW_KEYWORD(token) \ - SQLyylval.pParseNode = new OSQLInternalNode(aEmptyString, SQL_NODE_KEYWORD, (token)); return token; + SQLyylval.pParseNode = new OSQLInternalNode(aEmptyStr, SQL_NODE_KEYWORD, (token)); return token; #define SQL_NEW_INTNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_INTNUM); return SQL_TOKEN_INTNUM; #define SQL_NEW_APPROXNUM SQL_NEW_NODE(::rtl::OUString(SQLyytext,strlen(SQLyytext),RTL_TEXTENCODING_UTF8), SQL_NODE_APPROXNUM); return SQL_TOKEN_APPROXNUM; |