diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2017-05-01 15:43:53 +0300 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2017-05-01 15:43:53 +0300 |
| commit | d6d253ea7d3c3b4fd7cc402449eadef31d493203 (patch) | |
| tree | e2cd5291c9395f76a7afe297f8ed78a59abd163a /um/wrappers | |
| parent | um: strip the 'lib' prefix from include/ dirs (diff) | |
| download | windows7-drivers-d6d253ea7d3c3b4fd7cc402449eadef31d493203.tar.gz windows7-drivers-d6d253ea7d3c3b4fd7cc402449eadef31d493203.zip | |
um: strip the 'lib' prefix from namespace names
Diffstat (limited to 'um/wrappers')
6 files changed, 10 insertions, 10 deletions
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 <Windows.h> -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 <string> -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 <string> #include <vector> -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"; } |