summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2019-03-07 09:08:04 -0800
committerPatrick Venture <venture@google.com>2019-03-07 09:09:49 -0800
commit68448333b1395fc30291879624911ee5fa4ddf63 (patch)
treed395115c84fe76f0e39eb3d8441c6a252a78d9a7
parentfe94b4836ae9a180dc1e68fe79fed99e942cc36e (diff)
downloadipmi-blob-tool-68448333b1395fc30291879624911ee5fa4ddf63.tar.gz
ipmi-blob-tool-68448333b1395fc30291879624911ee5fa4ddf63.zip
move internal namespace under ipmiblob namespace
Avoid collisions if anyone else has this class under their own internal namespace by properly wrapping this internal namespace under the library's. Change-Id: I935c017cc109f12b339f4c65258ee43a03b3a3d5 Signed-off-by: Patrick Venture <venture@google.com>
-rw-r--r--src/ipmiblob/internal/sys.cpp3
-rw-r--r--src/ipmiblob/internal/sys.hpp3
-rw-r--r--test/internal_sys_mock.hpp3
3 files changed, 9 insertions, 0 deletions
diff --git a/src/ipmiblob/internal/sys.cpp b/src/ipmiblob/internal/sys.cpp
index 46c6642..71cd182 100644
--- a/src/ipmiblob/internal/sys.cpp
+++ b/src/ipmiblob/internal/sys.cpp
@@ -21,6 +21,8 @@
#include <sys/mman.h>
#include <unistd.h>
+namespace ipmiblob
+{
namespace internal
{
@@ -68,3 +70,4 @@ int SysImpl::poll(struct pollfd* fds, nfds_t nfds, int timeout) const
SysImpl sys_impl;
} // namespace internal
+} // namespace ipmiblob
diff --git a/src/ipmiblob/internal/sys.hpp b/src/ipmiblob/internal/sys.hpp
index 2975b8c..ba9bcbe 100644
--- a/src/ipmiblob/internal/sys.hpp
+++ b/src/ipmiblob/internal/sys.hpp
@@ -13,6 +13,8 @@
#include <cinttypes>
#include <cstddef>
+namespace ipmiblob
+{
namespace internal
{
@@ -59,3 +61,4 @@ class SysImpl : public Sys
extern SysImpl sys_impl;
} // namespace internal
+} // namespace ipmiblob
diff --git a/test/internal_sys_mock.hpp b/test/internal_sys_mock.hpp
index b4ba4b1..2fe0c58 100644
--- a/test/internal_sys_mock.hpp
+++ b/test/internal_sys_mock.hpp
@@ -6,6 +6,8 @@
#include <gmock/gmock.h>
+namespace ipmiblob
+{
namespace internal
{
@@ -25,3 +27,4 @@ class InternalSysMock : public Sys
};
} // namespace internal
+} // namespace ipmiblob
OpenPOWER on IntegriCloud