From 9344e45cd3d8695dca85b9317a85a8cea4e996fa Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 17 Oct 2017 21:52:29 +0000 Subject: [PATCH] Silence some "implicit conversion of string literal" warnings llvm-svn: 316038 --- .../Plugins/ExpressionParser/Clang/ClangASTSource.cpp | 10 +++++----- .../ExpressionParser/Clang/ClangExpressionDeclMap.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp index c1323723cad6..7f031356b3c3 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp @@ -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; } @@ -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(); } @@ -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; } } @@ -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(); } diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp index b90247ab62f2..e2a660c41472 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp +++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp @@ -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(); } } @@ -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; }