maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Host: unconstify editline paramters 

Although the interface to el_push should be a constant parameter (as it is on
Darwin), certain Linux distributions currently ship a header which does not
provide proper const correctness.  This causes compilation failures on Linux.
Strip the constness on the parameter, which whilst incorrect, is mostly
harmless.  The parameter will not be changed by the interface and so it is
acceptable to do this.  When distributions have updated to a more correct
declaration, it would be nice to revert this change.

Addresses PR18784.

llvm-svn: 201092
This commit is contained in:
Saleem Abdulrasool 2014-02-10 16:10:42 +00:00
parent bcde0c49cb
commit 78c135942d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lldb/source/Host/common/Editline.cpp
View File

@ -264,7 +264,8 @@ Editline::Push (const char *bytes, size_t len)
{
// Must NULL terminate the string for el_push() so we stick it
// into a std::string first
::el_push(m_editline, std::string (bytes, len).c_str());
::el_push(m_editline,
const_cast<char*>(std::string (bytes, len).c_str()));
return len;
}
return 0;
@ -340,7 +341,8 @@ Editline::GetLines(const std::string &end_line, StringList &lines)
// we were editing previous lines, then populate the line
// with the appropriate contents
if (line_idx+1 < lines.GetSize() && !lines[line_idx+1].empty())
::el_push (m_editline, lines[line_idx+1].c_str());
::el_push (m_editline,
const_cast<char*>(lines[line_idx+1].c_str()));
}
else if (line_status == LineStatus::Error)
{
@ -356,7 +358,8 @@ Editline::GetLines(const std::string &end_line, StringList &lines)
//::fprintf (out_file, "\033[1A\033[%uD\033[2K", (uint32_t)(m_lines_prompt.size() + lines[line_idx].size())); // Make cursor go up a line and clear that line
::fprintf (out_file, "\033[1A\033[1000D\033[2K");
if (!lines[line_idx-1].empty())
::el_push (m_editline, lines[line_idx-1].c_str());
::el_push (m_editline,
const_cast<char*>(lines[line_idx-1].c_str()));
--m_lines_curr_line;
}
break;
@ -366,7 +369,8 @@ Editline::GetLines(const std::string &end_line, StringList &lines)
//::fprintf (out_file, "\033[1B\033[%uD\033[2K", (uint32_t)(m_lines_prompt.size() + lines[line_idx].size()));
::fprintf (out_file, "\033[1B\033[1000D\033[2K");
if (line_idx+1 < lines.GetSize() && !lines[line_idx+1].empty())
::el_push (m_editline, lines[line_idx+1].c_str());
::el_push (m_editline,
const_cast<char*>(lines[line_idx+1].c_str()));
break;
}
}