Fix a C++11 issue: separate string literals and macros with a space.

rprichard · Oct 13, 2015 · bde8922 · bde8922
1 parent dd438a9
commit bde8922
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/agent/Terminal.cc b/agent/Terminal.cc
@@ -302,7 +302,7 @@ void Terminal::finishOutput(const std::pair<int, int> &newCursorPos)
     if (m_cursorHidden) {
         moveTerminalToLine(newCursorPos.second);
         char buffer[32];
-        sprintf(buffer, CSI"%dG"CSI"?25h", newCursorPos.first + 1);
+        sprintf(buffer, CSI"%dG" CSI"?25h", newCursorPos.first + 1);
         if (!m_consoleMode)
             m_output->write(buffer);
         m_cursorHidden = false;
@@ -329,7 +329,7 @@ void Terminal::moveTerminalToLine(int line)
     if (line < m_remoteLine) {
         // CUrsor Up (CUU)
         char buffer[32];
-        sprintf(buffer, "\r"CSI"%dA", m_remoteLine - line);
+        sprintf(buffer, "\r" CSI"%dA", m_remoteLine - line);
         if (!m_consoleMode)
             m_output->write(buffer);
         m_remoteLine = line;

diff --git a/libwinpty/winpty.cc b/libwinpty/winpty.cc
@@ -92,7 +92,7 @@ static bool pathExists(const std::wstring &path)
 static std::wstring findAgentProgram()
 {
     std::wstring progDir = dirname(getModuleFileName(getCurrentModule()));
-    std::wstring ret = progDir + L"\\"AGENT_EXE;
+    std::wstring ret = progDir + (L"\\" AGENT_EXE);
     assert(pathExists(ret));
     return ret;
 }