service: Use nested namespace specifiers where applicable

There were a few places where nested namespace specifiers weren't being
used where they could be within the service code. This amends that to
make the namespacing a tiny bit more compact.
This commit is contained in:
Lioncash
2018-09-22 14:23:08 +02:00
committed by fearlessTobi
parent 80cdfe1c45
commit 46da908a00
221 changed files with 443 additions and 902 deletions

View File

@@ -9,8 +9,7 @@
#include "core/core.h"
#include "core/hle/service/ldr_ro/cro_helper.h"
namespace Service {
namespace LDR {
namespace Service::LDR {
static const ResultCode ERROR_BUFFER_TOO_SMALL = // 0xE0E12C1F
ResultCode(static_cast<ErrorDescription>(31), ErrorModule::RO, ErrorSummary::InvalidArgument,
@@ -1514,5 +1513,4 @@ std::tuple<VAddr, u32> CROHelper::GetExecutablePages() const {
return std::make_tuple(0, 0);
}
} // namespace LDR
} // namespace Service
} // namespace Service::LDR

View File

@@ -11,8 +11,7 @@
#include "core/hle/result.h"
#include "core/memory.h"
namespace Service {
namespace LDR {
namespace Service::LDR {
// GCC versions < 5.0 do not implement std::is_trivially_copyable.
// Excluding MSVC because it has weird behaviour for std::is_trivially_copyable.
@@ -711,5 +710,4 @@ private:
ResultCode ApplyExitRelocations(VAddr crs_address);
};
} // namespace LDR
} // namespace Service
} // namespace Service::LDR

View File

@@ -12,8 +12,7 @@
#include "core/hle/service/ldr_ro/cro_helper.h"
#include "core/hle/service/ldr_ro/ldr_ro.h"
namespace Service {
namespace LDR {
namespace Service::LDR {
static const ResultCode ERROR_ALREADY_INITIALIZED = // 0xD9612FF9
ResultCode(ErrorDescription::AlreadyInitialized, ErrorModule::RO, ErrorSummary::Internal,
@@ -591,5 +590,4 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<RO>()->InstallAsService(service_manager);
}
} // namespace LDR
} // namespace Service
} // namespace Service::LDR

View File

@@ -7,8 +7,7 @@
#include "core/hle/service/ldr_ro/memory_synchronizer.h"
#include "core/hle/service/service.h"
namespace Service {
namespace LDR {
namespace Service::LDR {
struct ClientSlot : public Kernel::SessionRequestHandler::SessionDataBase {
MemorySynchronizer memory_synchronizer;
@@ -152,5 +151,4 @@ private:
void InstallInterfaces(SM::ServiceManager& service_manager);
} // namespace LDR
} // namespace Service
} // namespace Service::LDR

View File

@@ -7,8 +7,7 @@
#include "core/hle/kernel/process.h"
#include "core/hle/service/ldr_ro/memory_synchronizer.h"
namespace Service {
namespace LDR {
namespace Service::LDR {
auto MemorySynchronizer::FindMemoryBlock(VAddr mapping, VAddr original) {
auto block = std::find_if(memory_blocks.begin(), memory_blocks.end(),
@@ -39,5 +38,4 @@ void MemorySynchronizer::SynchronizeOriginalMemory(Kernel::Process& process) {
}
}
} // namespace LDR
} // namespace Service
} // namespace Service::LDR

View File

@@ -11,8 +11,7 @@ namespace Kernel {
class Process;
}
namespace Service {
namespace LDR {
namespace Service::LDR {
/**
* This is a work-around before we implement memory aliasing.
@@ -42,5 +41,4 @@ private:
auto FindMemoryBlock(VAddr mapping, VAddr original);
};
} // namespace LDR
} // namespace Service
} // namespace Service::LDR