From af37476e23485443cfb25dbb3145fa93e31078d9 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 24 Mar 2024 13:29:35 +0100 Subject: [PATCH] chore: make material json loader use anonymous namespace --- src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp index db3d8f61..12998197 100644 --- a/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp +++ b/src/ObjLoading/Game/T6/Material/JsonMaterialLoader.cpp @@ -4,13 +4,13 @@ #include "Game/T6/Json/JsonMaterial.h" #include -#include #include #include using namespace nlohmann; +using namespace T6; -namespace T6 +namespace { class JsonLoader { @@ -362,7 +362,10 @@ namespace T6 IAssetLoadingManager& m_manager; std::vector& m_dependencies; }; +} // namespace +namespace T6 +{ bool LoadMaterialAsJson( std::istream& stream, Material& material, MemoryManager* memory, IAssetLoadingManager* manager, std::vector& dependencies) {