Commit 29eddbf7 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch '139-use-nested-namespaces-in-the-code-base' into 'master' 

Resolve "Use nested namespaces in the code base"

Closes #139

See merge request !82
parents b256c640 cc125647

include/client/hooks.hpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -37,8 +37,7 @@ struct statfs; 
struct linux_dirent;

struct linux_dirent;

struct linux_dirent64;

struct linux_dirent64;





namespace gkfs {

namespace gkfs::hook {

namespace hook {





int

int

hook_openat(int dirfd, const char* cpath, int flags, mode_t mode);

hook_openat(int dirfd, const char* cpath, int flags, mode_t mode);
@@ -164,7 +163,6 @@ hook_fstatfs(unsigned int fd, struct statfs* buf); 
int

int

hook_fsync(unsigned int fd);

hook_fsync(unsigned int fd);





} // namespace hook

} // namespace gkfs::hook

} // namespace gkfs





#endif
 
#endif

include/client/rpc/forward_metadata.hpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,6 @@ forward_mk_symlink(const std::string& path, const std::string& target_path); 




#endif

#endif







} // namespace rpc

} // namespace rpc

} // namespace gkfs

} // namespace gkfs

include/client/rpc/rpc_types.hpp

+4 −8
Original line number Original line Diff line number Diff line
@@ -49,8 +49,7 @@ 
#include <common/common_defs.hpp>

#include <common/common_defs.hpp>

#include <common/rpc/rpc_types.hpp>

#include <common/rpc/rpc_types.hpp>





namespace hermes {

namespace hermes::detail {

namespace detail {





struct hg_void_t {};

struct hg_void_t {};
@@ -62,11 +61,9 @@ hg_proc_void_t(hg_proc_t proc, void* data) { 
    return HG_SUCCESS;

    return HG_SUCCESS;

}

}





} // namespace detail

} // namespace hermes::detail

} // namespace hermes





namespace gkfs {

namespace gkfs::rpc {

namespace rpc {





//==============================================================================

//==============================================================================

// definitions for fs_config

// definitions for fs_config
@@ -2283,8 +2280,7 @@ struct chunk_stat { 
    };

    };

};

};





} // namespace rpc

} // namespace gkfs::rpc

} // namespace gkfs









#endif // GKFS_RPCS_TYPES_HPP
 
#endif // GKFS_RPCS_TYPES_HPP

include/client/syscalls/args.hpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -47,9 +47,7 @@ 
#include <fmt/format.h>

#include <fmt/format.h>

#include <client/syscalls/detail/syscall_info.h>

#include <client/syscalls/detail/syscall_info.h>





namespace gkfs {

namespace gkfs::syscall::arg {

namespace syscall {

namespace arg {





/** Allowed arg types (based on the values of the corresponding C enum) */

/** Allowed arg types (based on the values of the corresponding C enum) */

enum class type {

enum class type {
@@ -717,9 +715,7 @@ format_arg_to(FmtBuffer& buffer, const printable_arg& parg) { 
#undef LIKELY

#undef LIKELY

#undef UNLIKELY

#undef UNLIKELY





} // namespace arg

} // namespace gkfs::syscall::arg

} // namespace syscall

} // namespace gkfs





#endif // GKFS_SYSCALLS_ARGS_HPP

#endif // GKFS_SYSCALLS_ARGS_HPP

include/client/syscalls/decoder.hpp

+2 −4
Original line number Original line Diff line number Diff line
@@ -34,8 +34,7 @@ 
#include <client/syscalls/args.hpp>

#include <client/syscalls/args.hpp>

#include <client/syscalls/rets.hpp>

#include <client/syscalls/rets.hpp>





namespace gkfs {

namespace gkfs::syscall {

namespace syscall {





namespace detail {

namespace detail {
@@ -113,7 +112,6 @@ decode(FmtBuffer& buffer, const long syscall_number, const long argv[MAX_ARGS], 
    ret.formatter<FmtBuffer>()(buffer, result);

    ret.formatter<FmtBuffer>()(buffer, result);

}

}





} // namespace syscall

} // namespace gkfs::syscall

} // namespace gkfs





#endif // GKFS_SYSCALLS_DECODER_HPP
 
#endif // GKFS_SYSCALLS_DECODER_HPP
 
 No newline at end of file