commit 9344e45cd3d8695dca85b9317a85a8cea4e996fa
author Pavel Labath <labath@google.com> Tue Oct 17 21:52:29 2017 +0000
committer Pavel Labath <labath@google.com> Tue Oct 17 21:52:29 2017 +0000
tree 019e29240e409c13bdd79f2063f128913e4910af
parent 7ab1f7a421474d10847e478e7dc954a6217fe3e9

Silence some "implicit conversion of string literal" warnings

llvm-svn: 316038

lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
index c132372..7f03135 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangASTSource.cpp
@@ -441,7 +441,7 @@
 
       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::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 @@
     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 @@
         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();
   }
 

lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
index b90247a..e2a660c 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
@@ -303,7 +303,7 @@
         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 @@
             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;
       }