[Lldb-commits] [lldb] r316038 - Silence some "implicit conversion of string literal" warnings

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Oct 17 14:52:29 2017
New Revision: 316038

URL: http://llvm.org/viewvc/llvm-project?rev=316038&view=rev
Log:
Silence some "implicit conversion of string literal" warnings

Modified:
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
    lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp?rev=316038&r1=316037&r2=316038&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp Tue Oct 17 14:52:29 2017
@@ -441,7 +441,7 @@ void ClangASTSource::CompleteType(clang:
 
       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::CopyType
     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(De
     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::GuardedCopy
         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();
   }
 

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp?rev=316038&r1=316037&r2=316038&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp Tue Oct 17 14:52:29 2017
@@ -303,7 +303,7 @@ TypeFromUser ClangExpressionDeclMap::Dep
         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::ResolveUnkn
             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;
       }