mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-21 14:02:59 +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:
@@ -48,6 +48,8 @@
|
||||
#include <memory>
|
||||
#include <unordered_map>
|
||||
|
||||
using namespace OpenRCT2;
|
||||
|
||||
struct IFileDataRetriever
|
||||
{
|
||||
virtual ~IFileDataRetriever() = default;
|
||||
@@ -211,7 +213,7 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
namespace ObjectFactory
|
||||
namespace OpenRCT2::ObjectFactory
|
||||
{
|
||||
/**
|
||||
* @param jRoot Must be JSON node of type object
|
||||
@@ -591,4 +593,4 @@ namespace ObjectFactory
|
||||
}
|
||||
return result;
|
||||
}
|
||||
} // namespace ObjectFactory
|
||||
} // namespace OpenRCT2::ObjectFactory
|
||||
|
||||
Reference in New Issue
Block a user