mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2025-12-24 00:03:11 +01:00
Adopt existing namespaces into OpenRCT2 namespace (#22368)
* Put all of TitleSequenceManager into the same namespace * Move RideConstructionState into the OpenRCT2 namespace * Adopt existing namespaces into OpenRCT2 namespace This adds `using namespace OpenRCT2` to compilation units where appropriate, as a means to get the codebase to compile until these units have been placed in a namespace of their own.
This commit is contained in:
@@ -91,13 +91,13 @@ public:
|
||||
|
||||
constexpr void push_back(const T& val)
|
||||
{
|
||||
Guard::Assert(_count < MAX);
|
||||
OpenRCT2::Guard::Assert(_count < MAX);
|
||||
_data[_count++] = val;
|
||||
}
|
||||
|
||||
constexpr void push_back(T&& val)
|
||||
{
|
||||
Guard::Assert(_count < MAX);
|
||||
OpenRCT2::Guard::Assert(_count < MAX);
|
||||
_data[_count++] = std::move(val);
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@ public:
|
||||
|
||||
template<typename... Args> constexpr reference_type emplace_back(Args&&... args)
|
||||
{
|
||||
Guard::Assert(_count < MAX);
|
||||
OpenRCT2::Guard::Assert(_count < MAX);
|
||||
reference_type res = _data[_count++];
|
||||
::new (&res) T(std::forward<Args&&>(args)...);
|
||||
return res;
|
||||
|
||||
Reference in New Issue
Block a user