Skip to content

Commit

Permalink
Silence some "implicit conversion of string literal" warnings
Browse files Browse the repository at this point in the history
llvm-svn: 316038
  • Loading branch information
labath committed Oct 17, 2017
1 parent 7ab1f7a commit 9344e45
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
Expand Up @@ -441,7 +441,7 @@ void ClangASTSource::CompleteType(clang::ObjCInterfaceDecl *interface_decl) {

GetMergerUnchecked().CompleteType(interface_decl);
} else {
lldbassert(!"No mechanism for completing a type!");
lldbassert(0 && "No mechanism for completing a type!");
}
return;
}
Expand Down Expand Up @@ -1979,7 +1979,7 @@ clang::QualType ClangASTSource::CopyTypeWithMerger(
clang::ExternalASTMerger &merger,
clang::QualType type) {
if (!merger.HasImporterForOrigin(from_context)) {
lldbassert(!"Couldn't find the importer for a source context!");
lldbassert(0 && "Couldn't find the importer for a source context!");
return QualType();
}

Expand All @@ -1992,13 +1992,13 @@ clang::Decl *ClangASTSource::CopyDecl(Decl *src_decl) {
return m_ast_importer_sp->CopyDecl(m_ast_context, &from_context, src_decl);
} else if (m_merger_up) {
if (!m_merger_up->HasImporterForOrigin(from_context)) {
lldbassert(!"Couldn't find the importer for a source context!");
lldbassert(0 && "Couldn't find the importer for a source context!");
return nullptr;
}

return m_merger_up->ImporterForOrigin(from_context).Import(src_decl);
} else {
lldbassert("No mechanism for copying a decl!");
lldbassert(0 && "No mechanism for copying a decl!");
return nullptr;
}
}
Expand Down Expand Up @@ -2043,7 +2043,7 @@ CompilerType ClangASTSource::GuardedCopyType(const CompilerType &src_type) {
CopyTypeWithMerger(*src_ast->getASTContext(), *m_merger_up,
ClangUtil::GetQualType(src_type));
} else {
lldbassert("No mechanism for copying a type!");
lldbassert(0 && "No mechanism for copying a type!");
return CompilerType();
}

Expand Down
Expand Up @@ -303,7 +303,7 @@ TypeFromUser ClangExpressionDeclMap::DeportType(ClangASTContext &target,
clang::QualType::getFromOpaquePtr(parser_type.GetOpaqueQualType()));
return TypeFromUser(exported_type.getAsOpaquePtr(), &target);
} else {
lldbassert(!"No mechanism for deporting a type!");
lldbassert(0 && "No mechanism for deporting a type!");
return TypeFromUser();
}
}
Expand Down Expand Up @@ -1916,7 +1916,7 @@ bool ClangExpressionDeclMap::ResolveUnknownTypes() {
scratch_ast_context->GetMergerUnchecked(),
var_type).getAsOpaquePtr();
} else {
lldbassert(!"No mechanism to copy a resolved unknown type!");
lldbassert(0 && "No mechanism to copy a resolved unknown type!");
return false;
}

Expand Down

0 comments on commit 9344e45

Please sign in to comment.