Add namespace alias

Change-Id: I54e8bc7783cd6a4fa35018e8657be3b02204be67
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>

diff --git a/include/klay/audit/audit-trail.h b/include/klay/audit/audit-trail.h
index dcfd2985476bc04f91229c0f818f216f2ce86c53..850699fdb717e87a46736a528e733e98c78a3e47 100644 (file)
--- a/include/klay/audit/audit-trail.h
+++ b/include/klay/audit/audit-trail.h
@@ -24,7 +24,7 @@
 
 #include <klay/mainloop.h>
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT AuditTrail {
 public:
@@ -42,5 +42,8 @@ private:
        std::thread dispatcher;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_TRAIL_H__

diff --git a/include/klay/audit/console-sink.h b/include/klay/audit/console-sink.h
index a57db777bf909197346b17a5cf01b4fcc914a243..1afa7415dfaf3e05451586b48d18eae1638f4615 100644 (file)
--- a/include/klay/audit/console-sink.h
+++ b/include/klay/audit/console-sink.h
@@ -21,12 +21,15 @@
 
 #include "logsink.h"
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT ConsoleLogSink : public LogSink {
 public:
        void sink(const std::string& message) override;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_CONSOLE_LOGSINK_H__

diff --git a/include/klay/audit/dlog-sink.h b/include/klay/audit/dlog-sink.h
index 3313100e5da270c6d1f10d5e94b07377994faa98..f0e17c818220afed1d84d4ad0a581931f172e093 100644 (file)
--- a/include/klay/audit/dlog-sink.h
+++ b/include/klay/audit/dlog-sink.h
@@ -21,7 +21,7 @@
 
 #include "logsink.h"
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT DlogLogSink : public LogSink {
 public:
@@ -32,5 +32,8 @@ private:
        std::string tag;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_DLOG_LOGSINK_H__

diff --git a/include/klay/audit/logger-core.h b/include/klay/audit/logger-core.h
index ae28d3e14f2847b86617157ccea9bd239c11da5f..85e5d78429d8251d04cefa8dc5b2760d01aa1f7f 100644 (file)
--- a/include/klay/audit/logger-core.h
+++ b/include/klay/audit/logger-core.h
@@ -23,7 +23,7 @@
 #include <memory>
 #include <mutex>
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT LoggerCore {
 public:
@@ -46,5 +46,8 @@ private:
        ConsoleLogSink defaultSink;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_LOGGER_CORE_H__

diff --git a/include/klay/audit/logger.h b/include/klay/audit/logger.h
index 5282be58c79c7f727282d60621232dd5107812a2..b45a9ee4b0c743b478a34319ecee43ad873cdeae 100644 (file)
--- a/include/klay/audit/logger.h
+++ b/include/klay/audit/logger.h
@@ -25,7 +25,7 @@
 
 #include "logsink.h"
 
-namespace audit {
+namespace klay {
 
 enum class KLAY_EXPORT LogLevel : int {
        Silent,
@@ -98,5 +98,8 @@ do {                                                                   \
 #define INFO(args...)  GET_MACRO(args, INFO2, INFO1)(args)
 #define TRACE(args...) GET_MACRO(args, TRACE2, TRACE1)(args)
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_LOGGER_H__

diff --git a/include/klay/audit/logsink.h b/include/klay/audit/logsink.h
index 83f1915513be286f061a8b9f3eff3c4f8cefa7e7..af5740c19230a0504635d44a96526d579888419e 100644 (file)
--- a/include/klay/audit/logsink.h
+++ b/include/klay/audit/logsink.h
@@ -21,7 +21,7 @@
 
 #include <string>
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT LogSink {
 public:
@@ -30,5 +30,8 @@ public:
        virtual void sink(const std::string& message) = 0;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_LOGSINK_H__

diff --git a/include/klay/audit/null-sink.h b/include/klay/audit/null-sink.h
index 74297988329990259c5fdd2b7a465a5ac97bcc7c..2e261590f73368bb9aa9dd7a7e0cef9e344d9690 100644 (file)
--- a/include/klay/audit/null-sink.h
+++ b/include/klay/audit/null-sink.h
@@ -21,12 +21,15 @@
 
 #include "logsink.h"
 
-namespace audit {
+namespace klay {
 
 class KLAY_EXPORT NullLogSink : public LogSink {
 public:
        void sink(const std::string& message) override;
 };
 
-} // namespace audit
+} // namespace klay
+
+namespace audit = klay;
+
 #endif //__AUDIT_NULL_LOGSINK_H__

diff --git a/include/klay/auth/group.h b/include/klay/auth/group.h
index 625862a47225bb6898e521f0ef4c9f4b317ceefb..cd7abdf776f1a01e60e6498293e4456c165b3543 100644 (file)
--- a/include/klay/auth/group.h
+++ b/include/klay/auth/group.h
@@ -28,7 +28,7 @@
 #define INVALID_GID             UINT_MAX
 #endif
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Group final {
 public:
@@ -52,6 +52,8 @@ private:
        gid_t gid;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_GROUP_H__

diff --git a/include/klay/auth/user.h b/include/klay/auth/user.h
index a5130d936366c5f8cb18d6b741f79ad83d1a060e..d84f5a802497feaec854b5d6970b85e0c2f2bcf5 100644 (file)
--- a/include/klay/auth/user.h
+++ b/include/klay/auth/user.h
@@ -28,7 +28,7 @@
 #define INVALID_UID             UINT_MAX
 #endif
 
-namespace runtime  {
+namespace klay  {
 
 class KLAY_EXPORT User final {
 public:
@@ -58,6 +58,8 @@ private:
        gid_t gid;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_USER_H__

diff --git a/include/klay/cgroup.h b/include/klay/cgroup.h
index 1b41d455c8f086b39a04a2a2a7193079505dd5a9..4900ef4b8178069917de82f4f36449fa7bb7333a 100644 (file)
--- a/include/klay/cgroup.h
+++ b/include/klay/cgroup.h
@@ -22,7 +22,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Cgroup final {
 public:
@@ -44,6 +44,8 @@ public:
        static const std::string getPath(const std::string& subsystem, const pid_t pid);
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //!__RUNTIME_CGROUP_H__

diff --git a/include/klay/colorize.h b/include/klay/colorize.h
index 84b01036202934e44232ec4fb281a91d05132605..3c207024878d0f1bb0f19df1f5c67461aea7f263 100644 (file)
--- a/include/klay/colorize.h
+++ b/include/klay/colorize.h
@@ -17,7 +17,7 @@
 
 #include <ostream>
 
-namespace console {
+namespace klay {
 
 enum Code {
        BLACK = 31,
@@ -44,4 +44,6 @@ private:
        Code code;
 };
 
-} // namespace console
+} // namespace klay
+
+namespace console = klay;
\ No newline at end of file

diff --git a/include/klay/db/column.h b/include/klay/db/column.h
index 2b033d4fa7ac9714c3a4f7a8acd1c21e450245e0..acd0793df8f619400808792f9ae8f7e3b53e4cb7 100644 (file)
--- a/include/klay/db/column.h
+++ b/include/klay/db/column.h
@@ -24,6 +24,7 @@
 #include <klay/klay.h>
 #include <klay/db/statement.h>
 
+namespace klay {
 namespace database {
 
 class KLAY_EXPORT Column {
@@ -76,5 +77,8 @@ private:
 };
 
 } // namespace database
+} // namespace klay
+
+namespace database = klay::database;
 
 #endif //__DATABASE_COLUMN_H__

diff --git a/include/klay/db/connection.h b/include/klay/db/connection.h
index a6569c201f5d34f4f54141289598e53b7db75610..9f533c184df8de423b6291061b6936a329224bd4 100644 (file)
--- a/include/klay/db/connection.h
+++ b/include/klay/db/connection.h
@@ -23,6 +23,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace database {
 
 class KLAY_EXPORT Connection {
@@ -74,4 +75,8 @@ private:
 };
 
 } // namespace database
+} // namespace klay
+
+namespace database = klay::database;
+
 #endif //__DATABASE_CONNECTION_H__

diff --git a/include/klay/db/statement.h b/include/klay/db/statement.h
index 286de8b2ea3f7eaac23ff43b69d38f11a43668ce..1ae2cb9f8170ba350a03b44ea94c02890bc45466 100644 (file)
--- a/include/klay/db/statement.h
+++ b/include/klay/db/statement.h
@@ -24,6 +24,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace database {
 
 class Column;
@@ -82,5 +83,8 @@ private:
 };
 
 } // namespace database
+} // namespace klay
+
+namespace database = klay::database;
 
 #endif //__DATABASE_STATEMENT_H__

diff --git a/include/klay/dbus/connection.h b/include/klay/dbus/connection.h
index 283d63d77e4a5e6acba5b7a5c37e317beb982c5d..1559b6d8cb901366687a8ed788ced29072662916 100644 (file)
--- a/include/klay/dbus/connection.h
+++ b/include/klay/dbus/connection.h
@@ -26,6 +26,7 @@
 #include <klay/klay.h>
 #include <klay/dbus/variant.h>
 
+namespace klay {
 namespace dbus {
 
 class KLAY_EXPORT Connection {
@@ -158,5 +159,8 @@ private:
 };
 
 } // namespace dbus
+} // namespace klay
+
+namespace dbus = klay::dbus;
 
  #endif //! __RUNTIME_DBUS_CONNECTION_H__

diff --git a/include/klay/dbus/error.h b/include/klay/dbus/error.h
index a72cfafb46f49783974e13cbc128238551e079be..f89988aeeb658987fe080e8d30b028bb39382e90 100644 (file)
--- a/include/klay/dbus/error.h
+++ b/include/klay/dbus/error.h
@@ -21,6 +21,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace dbus {
 
 class KLAY_EXPORT Error {
@@ -37,5 +38,8 @@ private:
 };
 
 } // namespace dbus
+} // namespace klay
+
+namespace dbus = klay::dbus;
 
 #endif //!__RUNTIME_DBUS_ERROR_H__

diff --git a/include/klay/dbus/introspection.h b/include/klay/dbus/introspection.h
index 775cb5da45b0b6069f3c32c739a936317709caf4..3e4769fb787323cd0bd44a6d9828a97c5d30f0f1 100644 (file)
--- a/include/klay/dbus/introspection.h
+++ b/include/klay/dbus/introspection.h
@@ -25,6 +25,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace dbus {
 
 using BusNode = GDBusNodeInfo*;
@@ -85,5 +86,8 @@ private:
 };
 
 } // namespace dbus
+} // namespace klay
+
+namespace dbus = klay::dbus;
 
 #endif //! __RUNTIME_DBUS_INTROSPECTION_H__

diff --git a/include/klay/dbus/signal.h b/include/klay/dbus/signal.h
index 9573b8bdb757de4f45f4c85b93466035c4748c84..70d82c6757a9cafebc11f9926c0d0be2f50d492b 100644 (file)
--- a/include/klay/dbus/signal.h
+++ b/include/klay/dbus/signal.h
@@ -24,6 +24,7 @@
 #include <klay/klay.h>
 #include <klay/dbus/connection.h>
 
+namespace klay {
 namespace dbus {
 namespace signal {
 
@@ -86,5 +87,8 @@ void Sender::emit(const std::string &signalName,
 
 } // namespace signal
 } // namespace dbus
+} // namespace klay
+
+namespace dbus = klay::dbus;
 
 #endif //! __RUNTIME_DBUS_SIGNAL_H__

diff --git a/include/klay/dbus/variant.h b/include/klay/dbus/variant.h
index cd81660ec9ec686d6110fb2bc624796fbfad011c..90b3e539bd8f353ad6e695a7d265420e263ede84 100644 (file)
--- a/include/klay/dbus/variant.h
+++ b/include/klay/dbus/variant.h
@@ -23,6 +23,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace dbus {
 
 class KLAY_EXPORT Variant {
@@ -58,7 +59,9 @@ private:
        GVariantIter* iterator;
 };
 
-
 } // namespace dbus
+} // namespace klay
+
+namespace dbus = klay::dbus;
 
 #endif //!__RUNTIME_DBUS_VARIANT_H__

diff --git a/include/klay/error.h b/include/klay/error.h
index d9ec20dd5e4032baf857d99cfcc6e00030680817..e33978902d74e555df6a6a442a6f61cc3d0381d9 100644 (file)
--- a/include/klay/error.h
+++ b/include/klay/error.h
@@ -17,11 +17,13 @@
 #ifndef __RUNTIME_ERROR_H__
 #define __RUNTIME_ERROR_H__
 
+#include <errno.h>
+
 #include <string>
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Error {
 public:
@@ -33,5 +35,8 @@ public:
 KLAY_EXPORT std::string GetSystemErrorMessage();
 KLAY_EXPORT std::string GetSystemErrorMessage(int errorCode);
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif //__RUNTIME_ERROR_H__

diff --git a/include/klay/eventfd.h b/include/klay/eventfd.h
index e2560eebee20cd27e5300f4d59dcd3524cff9814..ae0b30213d8bc9c625eb907662bf189de13ac87a 100644 (file)
--- a/include/klay/eventfd.h
+++ b/include/klay/eventfd.h
@@ -21,7 +21,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT EventFD {
 public:
@@ -44,6 +44,8 @@ private:
        int fd;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_EVENTFD_H__

diff --git a/include/klay/exception.h b/include/klay/exception.h
index c91ea9621d0901f71ce9fa1948cc891421252071..37db51d1857a8d17625c9be7a46cd8a092716d61 100644 (file)
--- a/include/klay/exception.h
+++ b/include/klay/exception.h
@@ -22,7 +22,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Exception: public std::runtime_error {
 public:
@@ -71,5 +71,8 @@ EXCEPTION_DEFINE(TimeoutException)
 EXCEPTION_DEFINE(NoPermissionException)
 EXCEPTION_DEFINE(OutOfMemoryException)
 EXCEPTION_DEFINE(IOException)
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif //__RUNTIME_EXCEPTION_H__

diff --git a/include/klay/file-descriptor.h b/include/klay/file-descriptor.h
index 9991d7dcdefeb94a3a5cd16d6ca5036d69ca53cc..e9af1970ab024cd3e4c18e0547dd2c19a71482e4 100644 (file)
--- a/include/klay/file-descriptor.h
+++ b/include/klay/file-descriptor.h
@@ -19,7 +19,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 struct KLAY_EXPORT FileDescriptor {
        FileDescriptor(int fd = -1, bool autoclose = false) :
@@ -46,6 +46,8 @@ private:
        bool autoClose;
 };
 
-}
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_FILE_DESCRIPTOR_H__

diff --git a/include/klay/file-user.h b/include/klay/file-user.h
index c57d9d0bc3911cfaf0201eafad108804afbb3f22..021c5c4f874cb1e6b28ce651630ad39458877f87 100644 (file)
--- a/include/klay/file-user.h
+++ b/include/klay/file-user.h
@@ -22,7 +22,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT FileUser final {
 public:
@@ -36,6 +36,8 @@ public:
        static std::vector<pid_t> getList(const std::string &path, bool isMount = false);
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif /* __FILE_USER_H__ */

diff --git a/include/klay/filesystem.h b/include/klay/filesystem.h
index 68c23e657e04013d001c46d07aa4b7d17ac985d1..3cc60c8c42f1233d39db1d542468b6087cab66c3 100644 (file)
--- a/include/klay/filesystem.h
+++ b/include/klay/filesystem.h
@@ -24,7 +24,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT File {
 public:
@@ -195,5 +195,8 @@ public:
 int Open(const std::string& path, int flags, mode_t mode);
 void Close(int fd);
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif //__RUNTIME_FILESYSTEM_H__

diff --git a/include/klay/latch.h b/include/klay/latch.h
index 363871e169e3d62b62063843159f8e1a41f08e09..6ddf3fd908dc2a5ff12d6a703df1affe4fed2080 100644 (file)
--- a/include/klay/latch.h
+++ b/include/klay/latch.h
@@ -22,7 +22,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Latch {
 public:
@@ -72,5 +72,8 @@ private:
        unsigned int count;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif // __RUNTIME_LATCH_H__

diff --git a/include/klay/mainloop.h b/include/klay/mainloop.h
index 662020fb3f271a5adb1a9d1ffd88afb5c53299ca..2557828ae51b2f5025aba9638df50c1d2aafb624 100644 (file)
--- a/include/klay/mainloop.h
+++ b/include/klay/mainloop.h
@@ -30,7 +30,7 @@
 
 #include "eventfd.h"
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Mainloop {
 public:
@@ -58,6 +58,8 @@ private:
        void prepare();
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_MAINLOOP_H__

diff --git a/include/klay/namespace.h b/include/klay/namespace.h
index c8a52c954ec2ac8affd095e08401fb417d423d0e..b42f12cf7a59b76921b4ea1a2243a51f34865d88 100644 (file)
--- a/include/klay/namespace.h
+++ b/include/klay/namespace.h
@@ -21,7 +21,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Namespace final {
 public:
@@ -31,6 +31,8 @@ public:
        static void attach(const pid_t pid);
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //!__RUNTIME_NAMESPACE_H__

diff --git a/include/klay/netlink/netlink.h b/include/klay/netlink/netlink.h
index a69c4d6aab4d689908aee4dc8b7fe0411210320e..217be3a5adb4ede2f0b58ab3729c66f0b2844a99 100644 (file)
--- a/include/klay/netlink/netlink.h
+++ b/include/klay/netlink/netlink.h
@@ -26,6 +26,7 @@
 #define NETLINK_AUDIT 9
 #endif
 
+namespace klay {
 namespace netlink {
 
 class KLAY_EXPORT Netlink final {
@@ -51,6 +52,9 @@ private:
        unsigned int sequence;
 };
 
-} // namespace runtime
+} // namespace netlink
+} // namespace klay
+
+namespace netlink = klay::netlink;
 
 #endif //!__RUNTIME_NETLINK_NETLINK_H__

diff --git a/include/klay/pam.h b/include/klay/pam.h
index 93e1b05bc2c576b8d19ed66e7f73612eba9c807d..0ce71456d10d5a36596ceccecb44520aeac4a10c 100644 (file)
--- a/include/klay/pam.h
+++ b/include/klay/pam.h
@@ -24,7 +24,7 @@
 #include <syslog.h>
 #include <security/pam_appl.h>
 
-namespace runtime {
+namespace klay {
 
 class PAM final {
 public:
@@ -61,5 +61,8 @@ private:
        pam_handle_t* pamh;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif // __RUNTIME_PAM_H__

diff --git a/include/klay/process.h b/include/klay/process.h
index 87575ed74ba2f71931676c597875d764568fc02b..c1ff476a41480bc3edba770026009d97eba8cfe9 100644 (file)
--- a/include/klay/process.h
+++ b/include/klay/process.h
@@ -22,7 +22,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT Process {
 public:
@@ -52,5 +52,8 @@ private:
        std::vector<std::string> args;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
+
 #endif //__RUNTIME_PROCESS_H__

diff --git a/include/klay/rmi/callback-holder.h b/include/klay/rmi/callback-holder.h
index 99d1cf8d6d115d9b63163b1221e1e7ad15bb68e3..164e91c70cc37f48d0db87d607ae2d3c96ebe87d 100644 (file)
--- a/include/klay/rmi/callback-holder.h
+++ b/include/klay/rmi/callback-holder.h
@@ -22,6 +22,7 @@
 
 #include <klay/rmi/message.h>
 
+namespace klay {
 namespace rmi {
 
 template<typename Type, typename... Args>
@@ -71,4 +72,8 @@ struct CallbackHolder {
 };
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
+
 #endif //!__RMI_CALLBACK_HOLDER_H__

diff --git a/include/klay/rmi/client.h b/include/klay/rmi/client.h
index 2af2d316e901a7d6e1c6b58af7462795c597ee1d..96e771649c96e81fd52cb321552b3d22ea86df2b 100644 (file)
--- a/include/klay/rmi/client.h
+++ b/include/klay/rmi/client.h
@@ -28,6 +28,7 @@
 #include <klay/rmi/connection.h>
 #include <klay/rmi/callback-holder.h>
 
+namespace klay {
 namespace rmi {
 
 template <typename ExceptionModel>
@@ -185,4 +186,8 @@ public:
 using Client = RemoteAccessClient<DefaultExceptionModel>;
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_CLIENT_H__

diff --git a/include/klay/rmi/connection.h b/include/klay/rmi/connection.h
index 4a8cd8030deb2b256d662a5770bc03affde62d80..466a6142bc01fb1903ce38ee91f22c1ea3b8ac62 100644 (file)
--- a/include/klay/rmi/connection.h
+++ b/include/klay/rmi/connection.h
@@ -24,6 +24,7 @@
 #include <klay/rmi/socket.h>
 #include <klay/rmi/message.h>
 
+namespace klay {
 namespace rmi {
 
 class KLAY_EXPORT Connection {
@@ -58,4 +59,8 @@ private:
 };
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_CONNECTION_H__

diff --git a/include/klay/rmi/message-composer.h b/include/klay/rmi/message-composer.h
index 41d366add8184f9152dc5ab211b1861bae27e867..c9416887965962b68e191383a9d92412902b0073 100644 (file)
--- a/include/klay/rmi/message-composer.h
+++ b/include/klay/rmi/message-composer.h
@@ -21,6 +21,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace rmi {
 
 class KLAY_EXPORT MessageComposer {
@@ -67,4 +68,8 @@ private:
 };
 
 } // namespae rmi
+} // namespae klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_MESSAGE_COMPOSER_H__

diff --git a/include/klay/rmi/message.h b/include/klay/rmi/message.h
index e8afdd7b3e887105d99e26cc64456ef2682e299f..f0e606f78a1939a95407536ac628fbff3d84cef8 100644 (file)
--- a/include/klay/rmi/message.h
+++ b/include/klay/rmi/message.h
@@ -27,6 +27,7 @@
 #include <klay/file-descriptor.h>
 #include <klay/rmi/message-composer.h>
 
+namespace klay {
 namespace rmi {
 
 class KLAY_EXPORT Message {
@@ -238,4 +239,8 @@ template<> void Message::enclose(runtime::FileDescriptor&& fd);
 template<> void Message::disclose(runtime::FileDescriptor& fd);
 
 } // namespae rmi
+} // namespae klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_MESSAGE_H__

diff --git a/include/klay/rmi/method.h b/include/klay/rmi/method.h
index aae4cccda6f29ec4ffb978a8db3f0b7ad68f56d4..a27cf9516a074baa52d59b3c0c34640ce6ac1c28 100644 (file)
--- a/include/klay/rmi/method.h
+++ b/include/klay/rmi/method.h
@@ -28,6 +28,7 @@
 #include <klay/rmi/connection.h>
 #include <klay/rmi/callback-holder.h>
 
+namespace klay {
 namespace rmi {
 
 template <typename ExceptionModel = DefaultExceptionModel>
@@ -67,4 +68,8 @@ RemoteMethod<ExceptionModel>::~RemoteMethod()
 }
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_REMOTEMETHOD_H__

diff --git a/include/klay/rmi/notification.h b/include/klay/rmi/notification.h
index a48e108916b59ea6a47d5ae3fb8d1f4569f6ee9c..b2bec9aa75a46b7a8d8a61d5154cb7e4b00019ac 100644 (file)
--- a/include/klay/rmi/notification.h
+++ b/include/klay/rmi/notification.h
@@ -30,6 +30,7 @@
 #include <klay/rmi/message.h>
 #include <klay/audit/logger.h>
 
+namespace klay {
 namespace rmi {
 
 typedef std::pair<int, int> SubscriptionId;
@@ -71,4 +72,8 @@ void Notification::notify(Args&&... args)
 }
 
 } // namespae rmi
+} // namespae klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_NOTIFICATION_H__

diff --git a/include/klay/rmi/service.h b/include/klay/rmi/service.h
index 013cab129ca823bac43247489e9d13fd166df40b..5fe27480e18279fec8eae1f473f1456cb22e3494 100644 (file)
--- a/include/klay/rmi/service.h
+++ b/include/klay/rmi/service.h
@@ -140,6 +140,7 @@ setMethodHandler<TYPEOF(M), TYPEOF(STRIP(STRIP(M)))>                          \
 setMethodHandler<TYPEOF(M)>                                                   \
                                (P, STRINGIFY(TYPEOF(STRIP(M))), std::bind(&TYPEOF(STRIP(M)), T))
 
+namespace klay {
 namespace rmi {
 
 typedef std::function<bool(const Connection& connection)> ConnectionCallback;
@@ -276,5 +277,8 @@ void Service::notify(const std::string& name, Args&&... args)
 }
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
 
 #endif //__RMI_SERVICE_H__

diff --git a/include/klay/rmi/socket.h b/include/klay/rmi/socket.h
index 76b18728ec88064a980308142b4bb5a2e0834e15..21208e88b232bc07129fec3ae5a6bf52ecf61a3a 100644 (file)
--- a/include/klay/rmi/socket.h
+++ b/include/klay/rmi/socket.h
@@ -20,6 +20,7 @@
 #include <klay/klay.h>
 #include <klay/exception.h>
 
+namespace klay {
 namespace rmi {
 
 class KLAY_EXPORT SocketException: public runtime::Exception {
@@ -68,4 +69,8 @@ private:
 };
 
 } // namespace rmi
+} // namespace klay
+
+namespace rmi = klay::rmi;
+
 #endif //__RMI_SOCKET_H__

diff --git a/include/klay/serialize.h b/include/klay/serialize.h
index 0fccf1bae811f6db28197a894bd00a840fc8f4c5..90b54910103de0f1b1db4b66f15b036ac38c2cb0 100644 (file)
--- a/include/klay/serialize.h
+++ b/include/klay/serialize.h
@@ -24,7 +24,7 @@
 #include <klay/klay.h>
 #include <klay/reflection.h>
 
-namespace runtime {
+namespace klay {
 
 template<typename T>
 struct KLAY_EXPORT SerializableArgument {
@@ -145,6 +145,8 @@ private:
        StorageType& storage;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_SERIALIZER_H__

diff --git a/include/klay/testbench.h b/include/klay/testbench.h
index 7ad16a128f48826d4f76687eec3a4a487e0dda85..bc7089b6837e5bf61c5b6b4fb853ae232d8624b4 100644 (file)
--- a/include/klay/testbench.h
+++ b/include/klay/testbench.h
@@ -34,6 +34,7 @@ using namespace std::chrono;
                                                 auto ms = duration_cast<milliseconds>(end - start); \
                                                 auto time = ms.count();
 
+namespace klay {
 namespace testbench {
 
 struct KLAY_EXPORT Source {
@@ -169,4 +170,8 @@ void TestName##TestCase::standalone()
        return;                                             \
 }
 } // namespace testbench
+} // namespace klay
+
+namespace testbench = klay::testbench;
+
 #endif //!__KLAY_TESTBENCH_H__

diff --git a/include/klay/thread-pool.h b/include/klay/thread-pool.h
index a0da0247dd97389ac3936c80fa89b748b5b69d90..24f238edf681186e11c24d909e4c27d441bbe290 100644 (file)
--- a/include/klay/thread-pool.h
+++ b/include/klay/thread-pool.h
@@ -26,7 +26,7 @@
 
 #include <klay/klay.h>
 
-namespace runtime {
+namespace klay {
 
 class KLAY_EXPORT ThreadPool {
 public:
@@ -44,6 +44,8 @@ private:
        bool stop;
 };
 
-} // namespace runtime
+} // namespace klay
+
+namespace runtime = klay;
 
 #endif //__RUNTIME_THREAD_POOL_H__

diff --git a/include/klay/xml/document.h b/include/klay/xml/document.h
index ed6af71e253c53212f325b630d096d7d509db3e4..24ff52b0fcbd6431ff257806b215c5adda0ee20e 100644 (file)
--- a/include/klay/xml/document.h
+++ b/include/klay/xml/document.h
@@ -25,6 +25,7 @@
 #include <klay/klay.h>
 #include <klay/xml/node.h>
 
+namespace klay {
 namespace xml {
 
 class KLAY_EXPORT Document {
@@ -45,4 +46,8 @@ private:
 };
 
 } // namespace xml
+} // namespace klay
+
+namespace xml = klay::xml;
+
 #endif //__XML_DOCUMENT_H__

diff --git a/include/klay/xml/keepblanks.h b/include/klay/xml/keepblanks.h
index 13dff451a1296b218881288adfdb2705abea4ef2..76d5ac4d25f93db256b2ded550adcddb317a358d 100644 (file)
--- a/include/klay/xml/keepblanks.h
+++ b/include/klay/xml/keepblanks.h
@@ -21,6 +21,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace xml {
 
 class KLAY_EXPORT KeepBlanks {
@@ -36,4 +37,8 @@ private:
 };
 
 } // namespace xml
+} // namespace klay
+
+namespace xml = klay::xml;
+
 #endif //__XML_KEEPBLANKS_H__

diff --git a/include/klay/xml/node.h b/include/klay/xml/node.h
index 09ece09fe3fd3f9643c4e4a0885bb2f6d64d43ab..7693446985e288c745da0d619c76e73c93bfb126 100644 (file)
--- a/include/klay/xml/node.h
+++ b/include/klay/xml/node.h
@@ -25,6 +25,7 @@
 
 #include <klay/klay.h>
 
+namespace klay {
 namespace xml {
 
 class KLAY_EXPORT Node {
@@ -58,4 +59,8 @@ private:
 };
 
 } // namespace xml
+} // namespace klay
+
+namespace xml = klay::xml;
+
 #endif //__XML_NODE_H__

diff --git a/include/klay/xml/parser.h b/include/klay/xml/parser.h
index bce6ca5c3d049de980cbc0841b0ec9e16da58da8..f5d7857b75448b488bcabff4dfec288229a8c644 100644 (file)
--- a/include/klay/xml/parser.h
+++ b/include/klay/xml/parser.h
@@ -24,6 +24,7 @@
 #include <klay/klay.h>
 #include <klay/xml/document.h>
 
+namespace klay {
 namespace xml {
 
 class KLAY_EXPORT Parser {
@@ -36,4 +37,8 @@ private:
 };
 
 } // namespace xml
+} // namespace klay
+
+namespace xml = klay::xml;
+
 #endif //__XML_DOMPARSER_H__

diff --git a/src/audit/audit-trail.cpp b/src/audit/audit-trail.cpp
index e9fe96014af7b9053fa6a401a0ed9ca987c8a84f..0de4ac20f2546e9d90cd1e0d225b84b5c8032537 100644 (file)
--- a/src/audit/audit-trail.cpp
+++ b/src/audit/audit-trail.cpp
@@ -15,7 +15,7 @@
  */
 #include <klay/audit/audit-trail.h>
 
-namespace audit {
+namespace klay {
 
 AuditTrail::AuditTrail()
 {
@@ -49,4 +49,4 @@ void AuditTrail::unsubscribe(const int fd)
        mainloop.removeEventSource(fd);
 }
 
-} // namespace audit
+} // namespace klay

diff --git a/src/audit/console-sink.cpp b/src/audit/console-sink.cpp
index 77c8de49818f1159e12f0377914e9aaa28a713aa..792271113bdd895e7bc2ccd22403cd86ffe0d60c 100644 (file)
--- a/src/audit/console-sink.cpp
+++ b/src/audit/console-sink.cpp
@@ -18,11 +18,11 @@
 
 #include <klay/audit/console-sink.h>
 
-namespace audit {
+namespace klay {
 
 void ConsoleLogSink::sink(const std::string& message)
 {
        std::cout << message << std::flush;
 }
 
-} // namespace audit
+} // namespace klay

diff --git a/src/audit/dlog-sink.cpp b/src/audit/dlog-sink.cpp
index f5fdfb82b598165f5ff35df2a83fec7475394ecf..ae01bbfbbfd32b46c172d59eb827ae5a04ae142b 100644 (file)
--- a/src/audit/dlog-sink.cpp
+++ b/src/audit/dlog-sink.cpp
@@ -21,7 +21,7 @@
 #include <klay/audit/dlog-sink.h>
 #include <klay/audit/logger.h>
 
-namespace audit {
+namespace klay {
 
 DlogLogSink::DlogLogSink(const std::string& tag) : tag(tag) {}
 
@@ -52,4 +52,4 @@ void DlogLogSink::sink(const std::string &message)
        }
 }
 
-} // namespace audit
+} // namespace klay

diff --git a/src/audit/logger-core.cpp b/src/audit/logger-core.cpp
index f052efcb573d9902d3602b81e462e018fa8657dc..d7f616a46521d34dc10dfca61d07616a5d37983a 100644 (file)
--- a/src/audit/logger-core.cpp
+++ b/src/audit/logger-core.cpp
@@ -16,7 +16,7 @@
 
 #include <klay/audit/logger-core.h>
 
-namespace audit {
+namespace klay {
 
 std::unique_ptr<LoggerCore> LoggerCore::instance = nullptr;
 std::once_flag LoggerCore::flag;
@@ -39,4 +39,4 @@ void LoggerCore::dispatch(LogSink* logSink, const std::string& message)
        logSink->sink(message);
 }
 
-} // namespace audit
+} // namespace klay

diff --git a/src/audit/logger.cpp b/src/audit/logger.cpp
index 667ed097b53f3eb1c3626bb133b13ad093e1cc61..96b21f2629e70ba966ae59f2cfed86d48b0e2a1f 100644 (file)
--- a/src/audit/logger.cpp
+++ b/src/audit/logger.cpp
@@ -24,7 +24,7 @@
 #include <klay/audit/logger-core.h>
 #include <klay/audit/console-sink.h>
 
-namespace audit {
+namespace klay {
 
 std::string LogLevelToString(const LogLevel level)
 {
@@ -73,4 +73,4 @@ void Logger::log(LogSink* logSink, const LogRecord record)
        LoggerCore::GetInstance().dispatch(logSink, buffer.str());
 }
 
-} // namespace audit
+} // namespace klay

diff --git a/src/audit/null-sink.cpp b/src/audit/null-sink.cpp
index 0c7550be5734557d82edc287ba68c73092be9ac2..f140d3a63b5d4caefbfa8f6d1a53a7e903943e45 100644 (file)
--- a/src/audit/null-sink.cpp
+++ b/src/audit/null-sink.cpp
@@ -15,10 +15,10 @@
  */
 #include <klay/audit/null-sink.h>
 
-namespace audit {
+namespace klay {
 
 void NullLogSink::sink(const std::string& message)
 {
 };
 
-} // namespace audit
+} // namespace klay

diff --git a/src/auth/group.cpp b/src/auth/group.cpp
index e306f64bfb75b740c8570c841caaa131eb5a60b2..b61aaf29eeb716887c2588e7c53460cf1884b0d1 100644 (file)
--- a/src/auth/group.cpp
+++ b/src/auth/group.cpp
@@ -27,7 +27,7 @@
 #include <klay/exception.h>
 #include <klay/auth/group.h>
 
-namespace runtime {
+namespace klay {
 
 Group::Group(const Group& group) :
        name(group.name), gid(group.gid)
@@ -85,4 +85,4 @@ Group::Group() :
 {
 }
 
-} // namespace Shadow
+} // namespace klay

diff --git a/src/auth/user.cpp b/src/auth/user.cpp
index 3eba7d97f5cf4666ef5440f9ed867a0cac253d85..3e825f449c8ce174fac04f4ef54c6c24213f8ba9 100644 (file)
--- a/src/auth/user.cpp
+++ b/src/auth/user.cpp
@@ -27,7 +27,7 @@
 #include <klay/exception.h>
 #include <klay/auth/user.h>
 
-namespace runtime {
+namespace klay {
 
 User::User(const User& user) :
        name(user.name), uid(user.uid), gid(user.gid)
@@ -86,4 +86,4 @@ User::User() :
 {
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/cgroup.cpp b/src/cgroup.cpp
index d136e7deb3d9397a3a5086a4fa689e24d1cfb55b..d643e69aac44fa5500d27dd7864e8c8d6c314f15 100644 (file)
--- a/src/cgroup.cpp
+++ b/src/cgroup.cpp
@@ -30,7 +30,7 @@
 #define NAME_PATTERN "^[A-Za-z_][A-Za-z0-9_-]*"
 #define PATH_PATTERN "(/*[A-Za-z_][A-Za-z0-9_-]*)*"
 
-namespace runtime {
+namespace klay {
 
 bool Cgroup::existSubsystem(const std::string& name)
 {
@@ -215,4 +215,4 @@ const std::string Cgroup::getPath(const std::string& subsystem, const pid_t pid)
        return ret;
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/db/column.cpp b/src/db/column.cpp
index 7270986efefa736e986cf532452cdf0ccbb56e6a..0c8cdc10ab15d8ce4f9ecf2ae0b2a7330be1682a 100644 (file)
--- a/src/db/column.cpp
+++ b/src/db/column.cpp
@@ -15,6 +15,7 @@
  */
 #include <klay/db/column.h>
 
+namespace klay {
 namespace database {
 
 Column::Column(const Statement& stmt, int idx) :
@@ -68,3 +69,4 @@ int Column::getBytes() const
 }
 
 } // namespace database
+} // namespace klay

diff --git a/src/db/connection.cpp b/src/db/connection.cpp
index 639970a21913519d394a4493026d4056a2b31045..e39255f78126639a848d0809474ef7f712f19b2d 100644 (file)
--- a/src/db/connection.cpp
+++ b/src/db/connection.cpp
@@ -18,6 +18,7 @@
 #include <klay/exception.h>
 #include <klay/db/connection.h>
 
+namespace klay {
 namespace database {
 
 Connection::Connection(const std::string& name, const int flags, bool integrityCheck) :
@@ -64,3 +65,4 @@ int Connection::exec(const std::string& query)
 }
 
 } // namespace database
+} // namespace klay

diff --git a/src/db/statement.cpp b/src/db/statement.cpp
index b56be20415a50c1a645ca1552aa26fd49c7c8106..9e03809a389d5d5b32e75b5bf7647d0aee15368c 100644 (file)
--- a/src/db/statement.cpp
+++ b/src/db/statement.cpp
@@ -22,6 +22,7 @@
 #include <klay/db/statement.h>
 #include <klay/db/connection.h>
 
+namespace klay {
 namespace database {
 
 Statement::Statement(const Connection& db, const std::string& query) :
@@ -223,3 +224,4 @@ void Statement::bind(const std::string& name)
 }
 
 } // namespace database
+} // namespace klay

diff --git a/src/dbus/connection.cpp b/src/dbus/connection.cpp
index 6f9cc276c075200d1f9ce10e2500ac9d0f64cc0a..9724830aa0086a6883d85e9c08280413b76c662c 100644 (file)
--- a/src/dbus/connection.cpp
+++ b/src/dbus/connection.cpp
@@ -19,6 +19,7 @@
 #include <klay/dbus/connection.h>
 #include <klay/audit/logger.h>
 
+namespace klay {
 namespace dbus {
 
 namespace {
@@ -306,3 +307,4 @@ void Connection::onMethodCall(GDBusConnection* connection,
 }
 
 } // namespace dbus
+} // namespace klay

diff --git a/src/dbus/error.cpp b/src/dbus/error.cpp
index 43f8fa92c0953c5d40d662755076d4460bfad53d..e6ea3db77b6e004c9fd883f85a5e9187500d969b 100644 (file)
--- a/src/dbus/error.cpp
+++ b/src/dbus/error.cpp
@@ -15,6 +15,7 @@
  */
 #include <klay/dbus/error.h>
 
+namespace klay {
 namespace dbus {
 
 Error::Error() :
@@ -45,3 +46,4 @@ Error::operator bool () const
 }
 
 } // namespace dbus
+} // namespace klay

diff --git a/src/dbus/introspection.cpp b/src/dbus/introspection.cpp
index 05cffa28210d366fdee96b341c4fba381b42e82b..22f752e159ce0896752a473083680623f73931a1 100644 (file)
--- a/src/dbus/introspection.cpp
+++ b/src/dbus/introspection.cpp
@@ -25,6 +25,7 @@
 #include <memory>
 #include <functional>
 
+namespace klay {
 namespace dbus {
 
 namespace {
@@ -272,3 +273,4 @@ void Introspection::update(void)
 }
 
 } // namespace dbus
+} // namespace klay

diff --git a/src/dbus/signal.cpp b/src/dbus/signal.cpp
index 2498ed80583f556005788f91a81447d6bcfc19f7..f8f6694804952fd901c43804b328f29ea3b4fcc1 100644 (file)
--- a/src/dbus/signal.cpp
+++ b/src/dbus/signal.cpp
@@ -18,6 +18,7 @@
 #include <klay/dbus/introspection.h>
 #include <klay/exception.h>
 
+namespace klay {
 namespace dbus {
 namespace signal {
 
@@ -87,3 +88,4 @@ void Receiver::unsubscribe(unsigned int id) const
 
 } // namespace signal
 } // namespace dbus
+} // namespace klay

diff --git a/src/dbus/variant.cpp b/src/dbus/variant.cpp
index 423941d3e559545456e396a97a09eea85b22bd2f..679d3fd4720552b627d8d43ca943955306655186 100644 (file)
--- a/src/dbus/variant.cpp
+++ b/src/dbus/variant.cpp
@@ -15,6 +15,7 @@
  */
 #include <klay/dbus/variant.h>
 
+namespace klay {
 namespace dbus {
 
 Variant::Variant(GVariant* var) :
@@ -136,3 +137,4 @@ bool VariantIterator::get(const std::string& format, ...) const
 }
 
 } // namespace dbus
+} // namespace klay

diff --git a/src/error.cpp b/src/error.cpp
index b11f8376154fe5a75524c0f0908101d91441e2aa..2047d5a1c393ad1788ac5d6911746b8eb3e04bd0 100644 (file)
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -18,7 +18,7 @@
 
 #include <klay/error.h>
 
-namespace runtime {
+namespace klay {
 
 int Error::lastErrorCode()
 {
@@ -46,4 +46,4 @@ std::string GetSystemErrorMessage()
        return Error::message();
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/eventfd.cpp b/src/eventfd.cpp
index 8a7a876d3928f5589accac93d005fcc738284cc8..dd81c3889f2366036c5e00eee8feedfe23f16bed 100644 (file)
--- a/src/eventfd.cpp
+++ b/src/eventfd.cpp
@@ -23,7 +23,7 @@
 #include <klay/eventfd.h>
 #include <klay/exception.h>
 
-namespace runtime {
+namespace klay {
 
 EventFD::EventFD(unsigned int initval, int flags)
 {
@@ -61,4 +61,4 @@ void EventFD::receive()
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/exception.cpp b/src/exception.cpp
index e7cd928ef1dd0d95a77950ce5d91db76483eb606..737edae443daa593e7ed2076eef85e6d4f478ded 100644 (file)
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -16,7 +16,7 @@
 #include <klay/exception.h>
 #include <klay/preprocessor.h>
 
-namespace runtime {
+namespace klay {
 
 const char *Exception::name() const
 {
@@ -39,4 +39,4 @@ EXCEPTION_IMPLEMENT(TimeoutException, "Timeout")
 EXCEPTION_IMPLEMENT(NoPermissionException, "No permission")
 EXCEPTION_IMPLEMENT(OutOfMemoryException, "Out of memory")
 EXCEPTION_IMPLEMENT(IOException, "I/O error")
-} // namespace runtime
+} // namespace klay

diff --git a/src/file-descriptor.cpp b/src/file-descriptor.cpp
index 2f235249346e960464a79efc612a1588ca5b7915..11ab2a6205f0f2eaa351d6264c4b892d67096d17 100644 (file)
--- a/src/file-descriptor.cpp
+++ b/src/file-descriptor.cpp
@@ -18,7 +18,7 @@
 
 #include <klay/file-descriptor.h>
 
-namespace runtime {
+namespace klay {
 
 FileDescriptor::~FileDescriptor()
 {
@@ -44,4 +44,4 @@ FileDescriptor& FileDescriptor::operator=(FileDescriptor&& rhs)
        return *this;
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/file-user.cpp b/src/file-user.cpp
index ed12735dc5f1d8798304e0b00283b181195c550b..038f05a89e88eb44722f730beb883003c160cc29 100644 (file)
--- a/src/file-user.cpp
+++ b/src/file-user.cpp
@@ -24,7 +24,7 @@
 #include <klay/file-user.h>
 #include <klay/filesystem.h>
 
-namespace runtime {
+namespace klay {
 
 bool FileUser::isUsedAsFD(const std::string &filePath, const pid_t pid, bool isMount)
 {
@@ -139,4 +139,4 @@ std::vector<pid_t> FileUser::getList(const std::string &path, bool isMount)
        return list;
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index 69dd909b745941ea02ec175bfadf9e304455a20f..80fd0748fea6d7d52c72cd6193d9cf0e5e03ae4b 100644 (file)
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -32,7 +32,7 @@
 #include <klay/exception.h>
 #include <klay/filesystem.h>
 
-namespace runtime {
+namespace klay {
 
 File::File(const std::string& pathname, int flags) :
        File(pathname)
@@ -566,4 +566,4 @@ void Mount::mountEntry(const std::string& src, const std::string& dest, const st
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 0188e128ab08a23a3fdca94ae382639c822fd437..1cff11b8c31b27999ac91117f59887a021bf9e9a 100644 (file)
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -29,7 +29,7 @@
 
 #define MAX_EPOLL_EVENTS       16
 
-namespace runtime {
+namespace klay {
 
 Mainloop::Mainloop() :
        pollFd(::epoll_create1(EPOLL_CLOEXEC)),
@@ -152,4 +152,4 @@ void Mainloop::run(int timeout)
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/namespace.cpp b/src/namespace.cpp
index c52d9d45fb2c4d436823042f1979e09dee23f79d..1b16ef1fef008d6a2420a0d5c5adf5cd0537e098 100644 (file)
--- a/src/namespace.cpp
+++ b/src/namespace.cpp
@@ -22,7 +22,7 @@
 #include <klay/exception.h>
 #include <klay/namespace.h>
 
-namespace runtime {
+namespace klay {
 
 namespace {
 
@@ -77,4 +77,4 @@ void Namespace::unshare(int flags)
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/netlink/netlink.cpp b/src/netlink/netlink.cpp
index 2b86d26ea1f3d9081745f0454307d6a9a8c6933a..9199d0acef4987aaf346a324408d0f77345aee55 100644 (file)
--- a/src/netlink/netlink.cpp
+++ b/src/netlink/netlink.cpp
@@ -25,6 +25,7 @@
 #include <klay/audit/logger.h>
 #include <klay/netlink/netlink.h>
 
+namespace klay {
 namespace netlink {
 
 Netlink::Netlink(int protocol) :
@@ -144,3 +145,4 @@ Netlink::Message Netlink::recv(int options)
 }
 
 } // namespace runtime
+} // namespace klay

diff --git a/src/pam.cpp b/src/pam.cpp
index f2daf7089ce0775f8287aab596784f26f2686b48..84cb6f3450e574db4a355713b6f6f89e3bb3378c 100644 (file)
--- a/src/pam.cpp
+++ b/src/pam.cpp
@@ -23,7 +23,7 @@
 #include <klay/pam.h>
 #include <klay/exception.h>
 
-namespace runtime {
+namespace klay {
 
 PAM::PAM(const std::string& service, const std::string& user)
 {
@@ -161,4 +161,4 @@ void PAM::closeSession(int flags)
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/process.cpp b/src/process.cpp
index ffb9844d7b14b76243e910f8a1ad85a694fbd7f2..9b2f583e0b8a0c3278c773dd94cc70bd79341006 100644 (file)
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -23,7 +23,7 @@
 #include <klay/process.h>
 #include <klay/exception.h>
 
-namespace runtime {
+namespace klay {
 
 Process::Process(const std::string& prog) :
        status(-1), pid(-1), program(prog)
@@ -97,4 +97,4 @@ void Process::terminate()
        }
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/rmi/client.cpp b/src/rmi/client.cpp
index c4e7f0377b3e1eb0725e251b092bc75e43a7eb3e..d29c75a18d0be3546ec4bb361f541f9f93eab843 100644 (file)
--- a/src/rmi/client.cpp
+++ b/src/rmi/client.cpp
@@ -16,6 +16,7 @@
 #include <klay/exception.h>
 #include <klay/rmi/client.h>
 
+namespace klay {
 namespace rmi {
 
 void DefaultExceptionModel::raise(const std::string& target, const std::string& msg)
@@ -41,3 +42,4 @@ void DefaultExceptionModel::raise(const std::string& target, const std::string&
 }
 
 } // namespace rmi
+} // namespace klay

diff --git a/src/rmi/connection.cpp b/src/rmi/connection.cpp
index b46bbfafd28284ec72351b718302ce965b95a1bc..04e50950685d02f6de26fd1f6fd597dd0dc74a24 100644 (file)
--- a/src/rmi/connection.cpp
+++ b/src/rmi/connection.cpp
@@ -18,6 +18,7 @@
 
 #include <klay/rmi/connection.h>
 
+namespace klay {
 namespace rmi {
 
 Connection::Connection(Socket&& sock) :
@@ -56,3 +57,4 @@ Message Connection::dispatch() const
 }
 
 } // namespace rmi
+} // namespace klay

diff --git a/src/rmi/message-composer.cpp b/src/rmi/message-composer.cpp
index 92f345672e9169fef335ad80d39c41a0ebde2b66..fb2c7ce9eb5727b86cd35776d1affae18c2de7db 100644 (file)
--- a/src/rmi/message-composer.cpp
+++ b/src/rmi/message-composer.cpp
@@ -22,6 +22,7 @@
 #include <klay/audit/logger.h>
 #include <klay/rmi/message-composer.h>
 
+namespace klay {
 namespace rmi {
 
 MessageComposer::MessageComposer(size_t caps) :
@@ -161,3 +162,4 @@ void MessageComposer::reserve(size_t size)
 }
 
 } // namespae rmi
+} // namespae klay

diff --git a/src/rmi/message.cpp b/src/rmi/message.cpp
index 9dcaa282831f20d20ab100ca4a3154d784c6c3ac..e09329fc4e58214e183808a43f4ba483fc3b4611 100644 (file)
--- a/src/rmi/message.cpp
+++ b/src/rmi/message.cpp
@@ -16,6 +16,7 @@
 #include <klay/exception.h>
 #include <klay/rmi/message.h>
 
+namespace klay {
 namespace rmi {
 
 std::atomic<unsigned int> Message::sequence(0);
@@ -107,3 +108,4 @@ template<> void Message::disclose(runtime::FileDescriptor& fd)
 }
 
 } // namespace rmi
+} // namespace klay

diff --git a/src/rmi/notification.cpp b/src/rmi/notification.cpp
index 81edc9b8a039ae2b63c989a58503fb0cfc1e0934..f071777d88df30547896d111e75907109cb0b51f 100644 (file)
--- a/src/rmi/notification.cpp
+++ b/src/rmi/notification.cpp
@@ -21,6 +21,7 @@
 #include <klay/exception.h>
 #include <klay/rmi/notification.h>
 
+namespace klay {
 namespace rmi {
 
 Notification::Notification()
@@ -69,3 +70,4 @@ int Notification::removeSubscriber(const int id)
 }
 
 } // namespace rmi
+} // namespace klay

diff --git a/src/rmi/service.cpp b/src/rmi/service.cpp
index df4c5701947d7f6687d14ce991137a44b8c64bfb..326529149edcd25c2eca823da77dd33fea0642fb 100644 (file)
--- a/src/rmi/service.cpp
+++ b/src/rmi/service.cpp
@@ -24,6 +24,7 @@
 #include <klay/rmi/message.h>
 #include <klay/audit/logger.h>
 
+namespace klay {
 namespace rmi {
 
 thread_local Service::ProcessingContext Service::processingContext;
@@ -243,3 +244,4 @@ void Service::onMessageProcess(const std::shared_ptr<Connection>& connection)
 }
 
 } // namespace rmi
+} // namespace klay

diff --git a/src/rmi/socket.cpp b/src/rmi/socket.cpp
index c6dae1768e5f79a9d91f9e463f8061ffac575980..3e2e3721e606c3068b3975e9a362efd3b336abfe 100644 (file)
--- a/src/rmi/socket.cpp
+++ b/src/rmi/socket.cpp
@@ -29,6 +29,7 @@
 #include <klay/error.h>
 #include <klay/rmi/socket.h>
 
+namespace klay {
 namespace rmi {
 
 namespace {
@@ -320,4 +321,5 @@ Socket Socket::connect(const std::string& path)
        return Socket(fd);
 }
 
-} // namespace Ipc
+} // namespace rmi
+} // namespace klay

diff --git a/src/testbench.cpp b/src/testbench.cpp
index 3f668dd137b21fb3f90fa3704eaefb5c26e900f7..d4718ccc128f3cd180f4cd41f9b9a71e5d174e6f 100644 (file)
--- a/src/testbench.cpp
+++ b/src/testbench.cpp
@@ -22,6 +22,7 @@
 
 using namespace console;
 
+namespace klay {
 namespace testbench {
 
 Source::Source(const std::string& file, long line, const std::string& msg) :
@@ -179,3 +180,4 @@ void Testbench::run()
 }
 
 } //namespace testbench
+} //namespace klay

diff --git a/src/thread-pool.cpp b/src/thread-pool.cpp
index ee20c86b313159b8ad10893b89a992334df3797b..e5cc45c8df0a18e76bc508e1ef08beae89870b31 100644 (file)
--- a/src/thread-pool.cpp
+++ b/src/thread-pool.cpp
@@ -23,7 +23,7 @@
 #define __BEGIN_CRITICAL__  { std::unique_lock<std::mutex> lock(this->queueMutex);
 #define __END_CRITICAL__    }
 
-namespace runtime {
+namespace klay {
 
 ThreadPool::ThreadPool(size_t threads)
        : stop(false)
@@ -75,4 +75,4 @@ void ThreadPool::submit(std::function<void()>&& task)
        condition.notify_one();
 }
 
-} // namespace runtime
+} // namespace klay

diff --git a/src/xml/document.cpp b/src/xml/document.cpp
index 30ebf473f6c28b659d979dc981f704c986d1ade6..b49d7a780405ef9f5a74a08985ec3e0e3ce27b1b 100644 (file)
--- a/src/xml/document.cpp
+++ b/src/xml/document.cpp
@@ -22,6 +22,7 @@
 #include <klay/xml/document.h>
 #include <klay/xml/keepblanks.h>
 
+namespace klay {
 namespace xml {
 
 Document::Document(const std::string& root, const std::string& version) :
@@ -132,3 +133,4 @@ void Document::write(const std::string& filename, const std::string& encoding, b
 }
 
 } // namespace xml
+} // namespace klay

diff --git a/src/xml/keepblanks.cpp b/src/xml/keepblanks.cpp
index 5077c3e126c6fbb5257d7abde357efd77b0a0a77..32c909f9a7cb1d664cbbf01eae6df7e10d8b4870 100644 (file)
--- a/src/xml/keepblanks.cpp
+++ b/src/xml/keepblanks.cpp
@@ -15,6 +15,7 @@
  */
 #include <klay/xml/keepblanks.h>
 
+namespace klay {
 namespace xml {
 
 KeepBlanks::KeepBlanks(bool value)
@@ -30,3 +31,4 @@ KeepBlanks::~KeepBlanks()
 }
 
 } // namespace xml
+} // namespace klay

diff --git a/src/xml/node.cpp b/src/xml/node.cpp
index 9a6e6b2d4597b4886be8b18b633272289c5ed313..a0055d041bdcf62f4a82814e9abb24d7e35ff64b 100644 (file)
--- a/src/xml/node.cpp
+++ b/src/xml/node.cpp
@@ -16,6 +16,7 @@
 #include <klay/exception.h>
 #include <klay/xml/node.h>
 
+namespace klay {
 namespace xml {
 
 Node::Node(xmlNode* node) :
@@ -113,3 +114,4 @@ bool Node::isBlank() const
 }
 
 } // namespace xml
+} // namespace klay

diff --git a/src/xml/parser.cpp b/src/xml/parser.cpp
index a20c88891db5d788e98fabd295b3de55cbf6cd5c..ddae583adcfca1f8570745fffa9455f5588cc0ff 100644 (file)
--- a/src/xml/parser.cpp
+++ b/src/xml/parser.cpp
@@ -19,6 +19,7 @@
 #include <klay/xml/parser.h>
 #include <klay/xml/keepblanks.h>
 
+namespace klay {
 namespace xml {
 
 Document* Parser::parseContext(xmlParserCtxt* context, bool validate)
@@ -80,3 +81,4 @@ Document* Parser::parseString(const std::string& xml, bool validate)
 }
 
 } // namespace xml
+} // namespace klay