[Libreoffice-commits] .: Branch 'libreoffice-3-4' - connectivity/inc connectivity/source

Lubos Lunak llunak at kemper.freedesktop.org
Tue May 31 03:30:18 PDT 2011


 connectivity/inc/connectivity/sqlparse.hxx |    2 +-
 connectivity/source/parse/sqlbison.y       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b3fb3b00d4ee80c40f62988f4d22b470a833cbf
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 dbfbd7a..4fc353a 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4333,7 +4333,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