[Libreoffice-commits] .: connectivity/inc connectivity/source
Lubos Lunak
llunak at kemper.freedesktop.org
Tue May 31 03:30:30 PDT 2011
connectivity/inc/connectivity/sqlparse.hxx | 2 +-
connectivity/source/parse/sqlbison.y | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1074f8f6976cd64a1e9995e8ea9f317817212a43
Author: Kelly Anderson <cbxbiker61 at gmail.com>
Date: Tue May 31 12:26:34 2011 +0200
fix compile with Bison 2.5
Signed-off-by: LuboÅ¡ LuÅák <l.lunak at suse.cz>
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 531f1ac..5d75c3f 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -232,7 +232,7 @@ namespace connectivity
// returns the type for a parameter in a given function name
static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
- void error(sal_Char *fmt);
+ void error(const sal_Char *fmt);
int SQLlex();
#ifdef YYBISON
void setParseTree(OSQLParseNode * pNewParseTree);
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 7abcacd..1f2c577 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4781,7 +4781,7 @@ void OSQLParser::reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank)
}
// -------------------------------------------------------------------------
-void OSQLParser::error(sal_Char *fmt)
+void OSQLParser::error(const sal_Char *fmt)
{
if(!m_sErrorMessage.getLength())
{
More information about the Libreoffice-commits
mailing list