From d6d253ea7d3c3b4fd7cc402449eadef31d493203 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 1 May 2017 15:43:53 +0300 Subject: um: strip the 'lib' prefix from namespace names --- um/service/include/service/device.hpp | 8 ++++---- um/service/include/service/handle.hpp | 8 ++++---- um/service/include/service/service.hpp | 8 ++++---- um/service/include/service/service_handle.hpp | 8 ++++---- um/service/include/service/service_manager.hpp | 8 ++++---- um/service/include/service/singleton.hpp | 2 +- um/service/include/service/windows_error.hpp | 4 ++-- um/service/src/device.cpp | 2 +- um/service/src/service.cpp | 2 +- um/service/src/service_manager.cpp | 2 +- um/service/src/windows_error.cpp | 2 +- um/service/test/windows_error.cpp | 2 +- um/service/utils/install_service.cpp | 2 +- um/service/utils/start_service.cpp | 2 +- um/service/utils/stop_service.cpp | 2 +- um/service/utils/uninstall_service.cpp | 2 +- um/wrappers/simple/include/simple/device.hpp | 4 ++-- um/wrappers/simple/src/device.cpp | 4 ++-- um/wrappers/simple/utils/exchange_ints.cpp | 2 +- um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp | 4 ++-- um/wrappers/special/nt_namespace/src/device.cpp | 4 ++-- um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp | 2 +- 22 files changed, 42 insertions(+), 42 deletions(-) (limited to 'um') diff --git a/um/service/include/service/device.hpp b/um/service/include/service/device.hpp index f61c59a..8ea2f90 100644 --- a/um/service/include/service/device.hpp +++ b/um/service/include/service/device.hpp @@ -15,7 +15,7 @@ #include #include -namespace libservice +namespace service { class Device { @@ -72,9 +72,9 @@ namespace libservice namespace std { template <> - inline void swap( - libservice::Device& a, - libservice::Device& b) LIBSERVICE_NOEXCEPT + inline void swap( + service::Device& a, + service::Device& b) LIBSERVICE_NOEXCEPT { a.swap(b); } diff --git a/um/service/include/service/handle.hpp b/um/service/include/service/handle.hpp index abd1d5a..916c365 100644 --- a/um/service/include/service/handle.hpp +++ b/um/service/include/service/handle.hpp @@ -13,7 +13,7 @@ #include #include -namespace libservice +namespace service { class Handle { @@ -74,9 +74,9 @@ namespace libservice namespace std { template <> - inline void swap( - libservice::Handle& a, - libservice::Handle& b) LIBSERVICE_NOEXCEPT + inline void swap( + service::Handle& a, + service::Handle& b) LIBSERVICE_NOEXCEPT { a.swap(b); } diff --git a/um/service/include/service/service.hpp b/um/service/include/service/service.hpp index ca01ab4..983817b 100644 --- a/um/service/include/service/service.hpp +++ b/um/service/include/service/service.hpp @@ -12,7 +12,7 @@ #include #include -namespace libservice +namespace service { class Service { @@ -70,9 +70,9 @@ namespace libservice namespace std { template <> - inline void swap( - libservice::Service& a, - libservice::Service& b) LIBSERVICE_NOEXCEPT + inline void swap( + service::Service& a, + service::Service& b) LIBSERVICE_NOEXCEPT { a.swap(b); } diff --git a/um/service/include/service/service_handle.hpp b/um/service/include/service/service_handle.hpp index 52e37f4..659f895 100644 --- a/um/service/include/service/service_handle.hpp +++ b/um/service/include/service/service_handle.hpp @@ -12,7 +12,7 @@ #include #include -namespace libservice +namespace service { class ServiceHandle { @@ -73,9 +73,9 @@ namespace libservice namespace std { template <> - inline void swap( - libservice::ServiceHandle& a, - libservice::ServiceHandle& b) LIBSERVICE_NOEXCEPT + inline void swap( + service::ServiceHandle& a, + service::ServiceHandle& b) LIBSERVICE_NOEXCEPT { a.swap(b); } diff --git a/um/service/include/service/service_manager.hpp b/um/service/include/service/service_manager.hpp index 3d4fe3a..f33817e 100644 --- a/um/service/include/service/service_manager.hpp +++ b/um/service/include/service/service_manager.hpp @@ -12,7 +12,7 @@ #include -namespace libservice +namespace service { class ServiceManager { @@ -60,9 +60,9 @@ namespace libservice namespace std { template <> - inline void swap( - libservice::ServiceManager& a, - libservice::ServiceManager& b) LIBSERVICE_NOEXCEPT + inline void swap( + service::ServiceManager& a, + service::ServiceManager& b) LIBSERVICE_NOEXCEPT { a.swap(b); } diff --git a/um/service/include/service/singleton.hpp b/um/service/include/service/singleton.hpp index 1c7b1a7..c76d54b 100644 --- a/um/service/include/service/singleton.hpp +++ b/um/service/include/service/singleton.hpp @@ -7,7 +7,7 @@ #include -namespace libservice +namespace service { template class Singleton diff --git a/um/service/include/service/windows_error.hpp b/um/service/include/service/windows_error.hpp index 13d7f47..c96dcfc 100644 --- a/um/service/include/service/windows_error.hpp +++ b/um/service/include/service/windows_error.hpp @@ -12,7 +12,7 @@ #include #include -namespace libservice +namespace service { class WindowsErrorCategory : public std::error_category @@ -48,7 +48,7 @@ namespace libservice "Error in function '" LIBSERVICE_FUNCTION_NAME "' at file '" LIBSERVICE_FILE_PATH "', line " LIBSERVICE_LINE_NUMBER_STRING #elif defined(__GNUC__) #define LIBSERVICE_ERROR_PREFIX \ - libservice::error::build_what(LIBSERVICE_FUNCTION_NAME, LIBSERVICE_FILE_PATH, LIBSERVICE_LINE_NUMBER) + service::error::build_what(LIBSERVICE_FUNCTION_NAME, LIBSERVICE_FILE_PATH, LIBSERVICE_LINE_NUMBER) #else #define LIBSERVICE_ERROR_PREFIX "Error" #endif diff --git a/um/service/src/device.cpp b/um/service/src/device.cpp index a6333c7..003c19d 100644 --- a/um/service/src/device.cpp +++ b/um/service/src/device.cpp @@ -14,7 +14,7 @@ #include #include -namespace libservice +namespace service { namespace { diff --git a/um/service/src/service.cpp b/um/service/src/service.cpp index f45436a..26cf35d 100644 --- a/um/service/src/service.cpp +++ b/um/service/src/service.cpp @@ -10,7 +10,7 @@ #include #include -namespace libservice +namespace service { namespace { diff --git a/um/service/src/service_manager.cpp b/um/service/src/service_manager.cpp index 96e0f75..58377ed 100644 --- a/um/service/src/service_manager.cpp +++ b/um/service/src/service_manager.cpp @@ -9,7 +9,7 @@ #include -namespace libservice +namespace service { ServiceManager ServiceManager::open() { diff --git a/um/service/src/windows_error.cpp b/um/service/src/windows_error.cpp index 90ebd7c..5b358ca 100644 --- a/um/service/src/windows_error.cpp +++ b/um/service/src/windows_error.cpp @@ -9,7 +9,7 @@ #include -namespace libservice +namespace service { std::string WindowsErrorCategory::message(int code) const { diff --git a/um/service/test/windows_error.cpp b/um/service/test/windows_error.cpp index 019939b..5785e99 100644 --- a/um/service/test/windows_error.cpp +++ b/um/service/test/windows_error.cpp @@ -17,7 +17,7 @@ int main() { throw std::system_error( ERROR_FILE_NOT_FOUND, - libservice::WindowsErrorCategory::get(), + service::WindowsErrorCategory::get(), LIBSERVICE_ERROR_PREFIX); } catch (const std::exception& e) diff --git a/um/service/utils/install_service.cpp b/um/service/utils/install_service.cpp index aed0ae1..c452e0d 100644 --- a/um/service/utils/install_service.cpp +++ b/um/service/utils/install_service.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) try { - libservice::Service::install(libservice::ServiceManager::open(), argv[1], argv[2]); + service::Service::install(service::ServiceManager::open(), argv[1], argv[2]); } catch (const std::exception& e) { diff --git a/um/service/utils/start_service.cpp b/um/service/utils/start_service.cpp index 7f23fd4..79c2d24 100644 --- a/um/service/utils/start_service.cpp +++ b/um/service/utils/start_service.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) try { - libservice::Service::open(libservice::ServiceManager::open(), argv[1]).start(); + service::Service::open(service::ServiceManager::open(), argv[1]).start(); } catch (const std::exception& e) { diff --git a/um/service/utils/stop_service.cpp b/um/service/utils/stop_service.cpp index 0f11878..d9ccde9 100644 --- a/um/service/utils/stop_service.cpp +++ b/um/service/utils/stop_service.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) try { - libservice::Service::open(libservice::ServiceManager::open(), argv[1]).stop(); + service::Service::open(service::ServiceManager::open(), argv[1]).stop(); } catch (const std::exception& e) { diff --git a/um/service/utils/uninstall_service.cpp b/um/service/utils/uninstall_service.cpp index 58a879c..aa5af85 100644 --- a/um/service/utils/uninstall_service.cpp +++ b/um/service/utils/uninstall_service.cpp @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) try { - libservice::Service::open(libservice::ServiceManager::open(), argv[1]).uninstall(); + service::Service::open(service::ServiceManager::open(), argv[1]).uninstall(); } catch (const std::exception& e) { diff --git a/um/wrappers/simple/include/simple/device.hpp b/um/wrappers/simple/include/simple/device.hpp index d8bdaad..acbda76 100644 --- a/um/wrappers/simple/include/simple/device.hpp +++ b/um/wrappers/simple/include/simple/device.hpp @@ -7,9 +7,9 @@ #include "service/all.hpp" -namespace libsimple +namespace simple { - class Device : libservice::Device + class Device : service::Device { public: Device(); diff --git a/um/wrappers/simple/src/device.cpp b/um/wrappers/simple/src/device.cpp index 7aeef96..2523be6 100644 --- a/um/wrappers/simple/src/device.cpp +++ b/um/wrappers/simple/src/device.cpp @@ -9,7 +9,7 @@ #include -namespace libsimple +namespace simple { namespace { @@ -18,7 +18,7 @@ namespace libsimple } Device::Device() - : libservice::Device(libservice::Device::open(device_path)) + : service::Device(service::Device::open(device_path)) { } unsigned int Device::exchange_ints(unsigned int src) const diff --git a/um/wrappers/simple/utils/exchange_ints.cpp b/um/wrappers/simple/utils/exchange_ints.cpp index bc210a6..cf8d70c 100644 --- a/um/wrappers/simple/utils/exchange_ints.cpp +++ b/um/wrappers/simple/utils/exchange_ints.cpp @@ -32,7 +32,7 @@ int main(int argc, char* argv[]) return 1; } - std::cout << libsimple::Device().exchange_ints(src) << "\n"; + std::cout << simple::Device().exchange_ints(src) << "\n"; } catch (const std::exception& e) { diff --git a/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp b/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp index 793db4b..a3d725c 100644 --- a/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp +++ b/um/wrappers/special/nt_namespace/include/nt_namespace/device.hpp @@ -9,9 +9,9 @@ #include -namespace libnt_namespace +namespace nt_namespace { - class Device : libservice::Device + class Device : service::Device { public: Device(); diff --git a/um/wrappers/special/nt_namespace/src/device.cpp b/um/wrappers/special/nt_namespace/src/device.cpp index 97b3886..1697e45 100644 --- a/um/wrappers/special/nt_namespace/src/device.cpp +++ b/um/wrappers/special/nt_namespace/src/device.cpp @@ -12,7 +12,7 @@ #include #include -namespace libnt_namespace +namespace nt_namespace { namespace { @@ -21,7 +21,7 @@ namespace libnt_namespace } Device::Device() - : libservice::Device(libservice::Device::open(device_path)) + : service::Device(service::Device::open(device_path)) { } std::wstring Device::convert_nt_path(const std::wstring& src) diff --git a/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp b/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp index 1954bd1..ec215dc 100644 --- a/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp +++ b/um/wrappers/special/nt_namespace/utils/convert_nt_path.cpp @@ -12,7 +12,7 @@ int wmain(int argc, wchar_t* argv[]) { try { - libnt_namespace::Device dev; + nt_namespace::Device dev; for (int i = 1; i < argc; ++i) std::wcout << dev.convert_nt_path(argv[i]) << L"\n"; } -- cgit v1.2.3