ExpressionParser: silence some GCC warnings

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

llvm-svn: 260868

2 files changed, 2 insertions, 2 deletions

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
index eab62aed6cb..235e5c18981 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
@@ -822,7 +822,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context)
     {
         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;
         }
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
index 0c293ee585c..78435698f47 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/IRForTarget.cpp
@@ -88,10 +88,10 @@ IRForTarget::IRForTarget (lldb_private::ClangExpressionDeclMap *decl_map,
     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)
 {
 }