connectivity/source/parse/sqlflex.l | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 412c67a916af39dbad674d02428463463d3e05b4
Author: Lionel Elie Mamane <lio...@mamane.lu>
Date: Wed Jul 10 16:11:17 2013 +0200
fix doubly-defined aEmptyStr with Bison 2.3
Change-Id: Ia54673f3e689a49b3e9101ae4cf5b57f1e68f592
diff --git a/connectivity/source/parse/sqlflex.l
b/connectivity/source/parse/sqlflex.l
index 7f8cf3e..675c131 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
