diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2015-06-29 18:32:42 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2015-06-29 18:33:52 +0200 |
commit | 21138abbc8e0db6ade80678c87f98f52edd876aa (patch) | |
tree | e727eb4a70b9700c71fa805fe59d33be1d1f4c99 /languages | |
parent | 9cd1936c37d0fd8b589b88b147e4de34d7b3aebe (diff) | |
download | tdevelop-21138abbc8e0db6ade80678c87f98f52edd876aa.tar.gz tdevelop-21138abbc8e0db6ade80678c87f98f52edd876aa.zip |
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6ea09339a5ff3d8edbabb17735be68cddb43d981)
Diffstat (limited to 'languages')
-rw-r--r-- | languages/cpp/cppcodecompletion.cpp | 1 | ||||
-rw-r--r-- | languages/cpp/simpletypecachebinder.h | 2 |
2 files changed, 2 insertions, 1 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; |