From 21138abbc8e0db6ade80678c87f98f52edd876aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 Jun 2015 18:32:42 +0200 Subject: Fix FTBFS with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6ea09339a5ff3d8edbabb17735be68cddb43d981) --- languages/cpp/cppcodecompletion.cpp | 1 + languages/cpp/simpletypecachebinder.h | 2 +- lib/cppparser/lexer.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index bf4bef5a..2e1e67f2 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -36,6 +36,7 @@ email : david.nolden.kdevelop@art-master.de #include "tag_creator.h" #include +#include #include diff --git a/languages/cpp/simpletypecachebinder.h b/languages/cpp/simpletypecachebinder.h index 3f950cbf..f21be109 100644 --- a/languages/cpp/simpletypecachebinder.h +++ b/languages/cpp/simpletypecachebinder.h @@ -37,7 +37,7 @@ class SimpleTypeCacheBinder : public Base { template SimpleTypeCacheBinder( InitType1 t, InitType2 t2 ) : Base ( t, t2 ), m_haveBasesCache( false ), secondaryActive( true ), primaryActive( true ) {} - using Base::LocateMode; + using typename Base::LocateMode; struct LocateDesc { TypeDesc mname; diff --git a/lib/cppparser/lexer.h b/lib/cppparser/lexer.h index 10be7705..dd3e5824 100644 --- a/lib/cppparser/lexer.h +++ b/lib/cppparser/lexer.h @@ -347,7 +347,7 @@ private: }; -inline Token::Token(const TQString & text = "") +inline Token::Token(const TQString & text) : m_type( -1 ), m_position( 0 ), m_length( 0 ), -- cgit v1.2.1