From 6dad6c604f89b8ffcddf08f9d81eecbb6b52b173 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 11 May 2015 14:03:30 +0300 Subject: utils: bugfix --- utils/install_service.cpp | 4 ++-- utils/libnt_path_converter/utils/convert_nt_path.cpp | 2 +- utils/libservice/test/windows_error.cpp | 4 ++-- utils/start_service.cpp | 4 ++-- utils/stop_service.cpp | 4 ++-- utils/uninstall_service.cpp | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'utils') diff --git a/utils/install_service.cpp b/utils/install_service.cpp index 7bed0d5..44fb199 100644 --- a/utils/install_service.cpp +++ b/utils/install_service.cpp @@ -8,8 +8,8 @@ #include "libservice/interface.hpp" +#include #include -#include int main(int argc, char* argv[]) { @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { libservice::Service::install(libservice::ServiceManager::open(), argv[1], argv[2]); } - catch (const std::system_error& e) + catch (const std::exception& e) { std::cerr << e.what() << "\n"; return 1; diff --git a/utils/libnt_path_converter/utils/convert_nt_path.cpp b/utils/libnt_path_converter/utils/convert_nt_path.cpp index d80cc5a..158395d 100644 --- a/utils/libnt_path_converter/utils/convert_nt_path.cpp +++ b/utils/libnt_path_converter/utils/convert_nt_path.cpp @@ -8,8 +8,8 @@ #include "libnt_path_converter/all.hpp" -#include #include +#include int wmain(int argc, wchar_t* argv[]) { diff --git a/utils/libservice/test/windows_error.cpp b/utils/libservice/test/windows_error.cpp index 461b4e6..376a7c8 100644 --- a/utils/libservice/test/windows_error.cpp +++ b/utils/libservice/test/windows_error.cpp @@ -10,8 +10,8 @@ #include +#include #include -#include int main() { @@ -19,7 +19,7 @@ int main() { throw std::system_error(ERROR_FILE_NOT_FOUND, libservice::WinErrorCategory::get(), LIBSERVICE_ERROR_PREFIX); } - catch (const std::system_error& e) + catch (const std::exception& e) { std::cerr << e.what() << "\n"; return -1; diff --git a/utils/start_service.cpp b/utils/start_service.cpp index 05ddba2..58b756d 100644 --- a/utils/start_service.cpp +++ b/utils/start_service.cpp @@ -8,8 +8,8 @@ #include "libservice/interface.hpp" +#include #include -#include int main(int argc, char* argv[]) { @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { libservice::Service::open(libservice::ServiceManager::open(), argv[1]).start(); } - catch (const std::system_error& e) + catch (const std::exception& e) { std::cerr << e.what() << "\n"; return 1; diff --git a/utils/stop_service.cpp b/utils/stop_service.cpp index 6f4a700..bd4f8ce 100644 --- a/utils/stop_service.cpp +++ b/utils/stop_service.cpp @@ -8,8 +8,8 @@ #include "libservice/interface.hpp" +#include #include -#include int main(int argc, char* argv[]) { @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { libservice::Service::open(libservice::ServiceManager::open(), argv[1]).stop(); } - catch (const std::system_error& e) + catch (const std::exception& e) { std::cerr << e.what() << "\n"; return 1; diff --git a/utils/uninstall_service.cpp b/utils/uninstall_service.cpp index 5929dfc..737742c 100644 --- a/utils/uninstall_service.cpp +++ b/utils/uninstall_service.cpp @@ -8,8 +8,8 @@ #include "libservice/interface.hpp" +#include #include -#include int main(int argc, char* argv[]) { @@ -23,7 +23,7 @@ int main(int argc, char* argv[]) { libservice::Service::open(libservice::ServiceManager::open(), argv[1]).uninstall(); } - catch (const std::system_error& e) + catch (const std::exception& e) { std::cerr << e.what() << "\n"; return 1; -- cgit v1.2.3