AuroraMiddleware/winpty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors related to C++11's new user-defined string literals

Browse Source
This commit is contained in:
Ryan Prichard 2015-12-17 20:10:07 -06:00
parent 4f38a876ec
commit bbdc8b82ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/Terminal.cc
View File

@ -57,7 +57,7 @@ Terminal::Terminal(NamedPipe *output) :
void Terminal::reset(bool sendClearFirst, int newLine) void Terminal::reset(bool sendClearFirst, int newLine)
{ {
if (sendClearFirst) if (sendClearFirst)
m_output->write(CSI"1;1H"CSI"2J"); m_output->write(CSI"1;1H" CSI"2J");
m_remoteLine = newLine; m_remoteLine = newLine;
m_cursorHidden = false; m_cursorHidden = false;
m_cursorPos = std::pair<int, int>(0, newLine); m_cursorPos = std::pair<int, int>(0, newLine);
@ -162,7 +162,7 @@ void Terminal::finishOutput(const std::pair<int, int> &newCursorPos)
if (m_cursorHidden) { if (m_cursorHidden) {
moveTerminalToLine(newCursorPos.second); moveTerminalToLine(newCursorPos.second);
char buffer[32]; char buffer[32];
sprintf(buffer, CSI"%dG"CSI"?25h", newCursorPos.first + 1); sprintf(buffer, CSI"%dG" CSI"?25h", newCursorPos.first + 1);
m_output->write(buffer); m_output->write(buffer);
m_cursorHidden = false; m_cursorHidden = false;
} }
@ -187,7 +187,7 @@ void Terminal::moveTerminalToLine(int line)
if (line < m_remoteLine) { if (line < m_remoteLine) {
// CUrsor Up (CUU) // CUrsor Up (CUU)
char buffer[32]; char buffer[32];
sprintf(buffer, "\r"CSI"%dA", m_remoteLine - line); sprintf(buffer, "\r" CSI"%dA", m_remoteLine - line);
m_output->write(buffer); m_output->write(buffer);
m_remoteLine = line; m_remoteLine = line;
} else if (line > m_remoteLine) { } else if (line > m_remoteLine) {

2
libwinpty/winpty.cc
View File

@ -136,7 +136,7 @@ static bool pathExists(const std::wstring &path)
static std::wstring findAgentProgram() static std::wstring findAgentProgram()
{ {
std::wstring progDir = dirname(getModuleFileName(getCurrentModule())); std::wstring progDir = dirname(getModuleFileName(getCurrentModule()));
std::wstring ret = progDir + L"\\"AGENT_EXE; std::wstring ret = progDir + (L"\\" AGENT_EXE);
assert(pathExists(ret)); assert(pathExists(ret));
return ret; return ret;
} }