[Lldb-commits] [lldb] r260868 - ExpressionParser: silence some GCC warnings

[Saleem Abdulrasool via lldb-commits]

Author: compnerd
Date: Sun Feb 14 21:23:14 2016
New Revision: 260868

URL: http://llvm.org/viewvc/llvm-project?rev=260868&view=rev
Log:
ExpressionParser: silence some GCC warnings

Silence a -Wreorder warning about order of member initialization and a
-Wqual-cast warning about casting away constness.  NFC.

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

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=260868&r1=260867&r2=260868&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp Sun Feb 14 21:23:14 2016
@@ -822,7 +822,7 @@ ClangExpressionDeclMap::FindExternalVisi
     {
         if (namespace_context->getName().str() == std::string(g_lldb_local_vars_namespace_cstr))
         {
-            CompilerDeclContext compiler_decl_ctx(GetClangASTContext(), (void*)context.m_decl_context);
+            CompilerDeclContext compiler_decl_ctx(GetClangASTContext(), const_cast<void *>(static_cast<const void *>(context.m_decl_context)));
             FindExternalVisibleDecls(context, lldb::ModuleSP(), compiler_decl_ctx, current_id);
             return;
         }

Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp?rev=260868&r1=260867&r2=260868&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp (original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp Sun Feb 14 21:23:14 2016
@@ -88,10 +88,10 @@ IRForTarget::IRForTarget (lldb_private::
     m_sel_registerName(NULL),
     m_intptr_ty(NULL),
     m_error_stream(error_stream),
+    m_execution_unit(execution_unit),
     m_result_store(NULL),
     m_result_is_pointer(false),
     m_reloc_placeholder(NULL),
-    m_execution_unit(execution_unit),
     m_entry_instruction_finder (FindEntryInstruction)
 {
 }