From 33572e210483565f969f49c282d39203c621ddf4 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 2 Jan 2018 12:58:11 +0100 Subject: [PATCH] src: Fixed Mac build and clang warnings --- .../data/parser/cxx/CxxAstVisitorComponentIndexer.cpp | 8 ++++---- src/lib_gui/platform_includes/includesMac.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp index 6856bd59..6d159785 100644 --- a/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp +++ b/src/lib_cxx/data/parser/cxx/CxxAstVisitorComponentIndexer.cpp @@ -175,7 +175,7 @@ void CxxAstVisitorComponentIndexer::visitTagDecl(clang::TagDecl* d) utility::convertAccessSpecifier(d->getAccess()), definitionKind ); - + if (clang::EnumDecl* enumDecl = clang::dyn_cast_or_null(d)) { recordTemplateMemberSpecialization( @@ -201,7 +201,7 @@ void CxxAstVisitorComponentIndexer::visitClassTemplateSpecializationDecl(clang:: { if (shouldVisitDecl(d)) { - clang::NamedDecl* specializedFromDecl; + clang::NamedDecl* specializedFromDecl = nullptr; // todo: use context and childcontext!! llvm::PointerUnion pu = d->getSpecializedTemplateOrPartial(); @@ -251,7 +251,7 @@ void CxxAstVisitorComponentIndexer::visitVarDecl(clang::VarDecl* d) ); recordTemplateMemberSpecialization( - d->getMemberSpecializationInfo(), + d->getMemberSpecializationInfo(), getAstVisitor()->getDeclNameCache()->getValue(d), getParseLocation(d->getLocation()), symbolKind @@ -264,7 +264,7 @@ void CxxAstVisitorComponentIndexer::visitVarTemplateSpecializationDecl(clang::Va { if (shouldVisitDecl(d)) { - clang::NamedDecl* specializedFromDecl; + clang::NamedDecl* specializedFromDecl = nullptr; // todo: use context and childcontext!! llvm::PointerUnion pu = d->getSpecializedTemplateOrPartial(); diff --git a/src/lib_gui/platform_includes/includesMac.h b/src/lib_gui/platform_includes/includesMac.h index 2f73309f..cbccfbe3 100644 --- a/src/lib_gui/platform_includes/includesMac.h +++ b/src/lib_gui/platform_includes/includesMac.h @@ -88,7 +88,7 @@ void setupPlatform(int argc, char *argv[]) void setupApp(int argc, char *argv[]) { FilePath path(QDir::currentPath().toStdString()); - AppPath::setAppPath(path.absolute().str() + "/"); + AppPath::setAppPath(path.getAbsolute().str() + "/"); if (!appIsMacBundle) {