From c342f4b2bcfd18d67c49e7af0d3e2f68e63564d4 Mon Sep 17 00:00:00 2001 From: eidheim Date: Wed, 28 Jun 2017 11:19:54 +0200 Subject: [PATCH] Updated submodules --- libclangmm | 2 +- src/terminal.cc | 10 +++++----- src/terminal.h | 2 +- tests/cmake_build_test.cc | 2 +- tests/process_test.cc | 8 ++++---- tiny-process-library | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libclangmm b/libclangmm index 4c5fa3f..c79b292 160000 --- a/libclangmm +++ b/libclangmm @@ -1 +1 @@ -Subproject commit 4c5fa3f0c171ccd7e8a7a19d650116ddf4614f78 +Subproject commit c79b2925ef5bf9677f447a05cf5a46bd24faf040 diff --git a/src/terminal.cc b/src/terminal.cc index 404d8ee..8cd9ab2 100644 --- a/src/terminal.cc +++ b/src/terminal.cc @@ -57,15 +57,15 @@ Terminal::Terminal() { } int Terminal::process(const std::string &command, const boost::filesystem::path &path, bool use_pipes) { - std::unique_ptr process; + std::unique_ptr process; if(use_pipes) - process=std::make_unique(command, path.string(), [this](const char* bytes, size_t n) { + process=std::make_unique(command, path.string(), [this](const char* bytes, size_t n) { async_print(std::string(bytes, n)); }, [this](const char* bytes, size_t n) { async_print(std::string(bytes, n), true); }); else - process=std::make_unique(command, path.string()); + process=std::make_unique(command, path.string()); if(process->get_id()<=0) { async_print("Error: failed to run command: " + command + "\n", true); @@ -76,7 +76,7 @@ int Terminal::process(const std::string &command, const boost::filesystem::path } int Terminal::process(std::istream &stdin_stream, std::ostream &stdout_stream, const std::string &command, const boost::filesystem::path &path) { - Process process(command, path.string(), [this, &stdout_stream](const char* bytes, size_t n) { + TinyProcessLib::Process process(command, path.string(), [this, &stdout_stream](const char* bytes, size_t n) { Glib::ustring umessage(std::string(bytes, n)); Glib::ustring::iterator iter; while(!umessage.validate(iter)) { @@ -113,7 +113,7 @@ void Terminal::async_process(const std::string &command, const boost::filesystem std::thread async_execute_thread([this, command, path, callback, quiet]() { std::unique_lock processes_lock(processes_mutex); stdin_buffer.clear(); - auto process=std::make_shared(command, path.string(), [this, quiet](const char* bytes, size_t n) { + auto process=std::make_shared(command, path.string(), [this, quiet](const char* bytes, size_t n) { if(!quiet) async_print(std::string(bytes, n)); }, [this, quiet](const char* bytes, size_t n) { diff --git a/src/terminal.h b/src/terminal.h index bae5ba2..4823ddb 100644 --- a/src/terminal.h +++ b/src/terminal.h @@ -67,7 +67,7 @@ private: const static std::regex link_regex; void apply_link_tags(Gtk::TextIter start_iter, Gtk::TextIter end_iter); - std::vector > processes; + std::vector> processes; std::mutex processes_mutex; Glib::ustring stdin_buffer; diff --git a/tests/cmake_build_test.cc b/tests/cmake_build_test.cc index 78767cd..2792e64 100644 --- a/tests/cmake_build_test.cc +++ b/tests/cmake_build_test.cc @@ -15,7 +15,7 @@ int main() { { CMake cmake(project_path); - Process process("cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..", (project_path/"build").string(), [](const char *bytes, size_t n) {}); + TinyProcessLib::Process process("cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..", (project_path/"build").string(), [](const char *bytes, size_t n) {}); g_assert(process.get_exit_status()==0); g_assert(cmake.get_executable(project_path/"build", project_path)==""); diff --git a/tests/process_test.cc b/tests/process_test.cc index 7cd9cb6..7db6c10 100644 --- a/tests/process_test.cc +++ b/tests/process_test.cc @@ -5,7 +5,7 @@ int main() { auto output=std::make_shared(); auto error=std::make_shared(); { - Process process("echo Test", "", [output](const char *bytes, size_t n) { + TinyProcessLib::Process process("echo Test", "", [output](const char *bytes, size_t n) { *output+=std::string(bytes, n); }); g_assert(process.get_exit_status()==0); @@ -14,7 +14,7 @@ int main() { } { - Process process("echo Test && ls an_incorrect_path", "", [output](const char *bytes, size_t n) { + TinyProcessLib::Process process("echo Test && ls an_incorrect_path", "", [output](const char *bytes, size_t n) { *output+=std::string(bytes, n); }, [error](const char *bytes, size_t n) { *error+=std::string(bytes, n); @@ -27,7 +27,7 @@ int main() { } { - Process process("bash", "", [output](const char *bytes, size_t n) { + TinyProcessLib::Process process("bash", "", [output](const char *bytes, size_t n) { *output+=std::string(bytes, n); }, nullptr, true); process.write("echo Test\n"); @@ -38,7 +38,7 @@ int main() { } { - Process process("cat", "", [output](const char *bytes, size_t n) { + TinyProcessLib::Process process("cat", "", [output](const char *bytes, size_t n) { *output+=std::string(bytes, n); }, nullptr, true); process.write("Test\n"); diff --git a/tiny-process-library b/tiny-process-library index 8025c45..cf212df 160000 --- a/tiny-process-library +++ b/tiny-process-library @@ -1 +1 @@ -Subproject commit 8025c4582384333afd22c988861b70cddae0e633 +Subproject commit cf212df358680ef0b4b30569672c770bd723a7aa