summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--languages/cpp/cppcodecompletion.cpp1
-rw-r--r--languages/cpp/simpletypecachebinder.h2
-rw-r--r--lib/cppparser/lexer.h2
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 <typeinfo>
+#include <vector>
#include <tqpopupmenu.h>
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 <class InitType1, class InitType2>
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 ),