From d6d253ea7d3c3b4fd7cc402449eadef31d493203 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Mon, 1 May 2017 15:43:53 +0300
Subject: um: strip the 'lib' prefix from namespace names
---
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 +-
6 files changed, 10 insertions(+), 10 deletions(-)
(limited to 'um/wrappers')
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";
}
--
cgit v1.2.3