From 4e86f99fe25208064ead52c41834850531b2d070 Mon Sep 17 00:00:00 2001 From: vladislavbelov Date: Fri, 30 Jun 2023 19:10:13 +0000 Subject: [PATCH] Replaces boost string general includes by more precise ones. Differential Revision: https://code.wildfiregames.com/D5066 This was SVN commit r27746. --- source/graphics/ColladaManager.cpp | 6 +++--- source/graphics/TerrainTextureManager.cpp | 1 - source/i18n/L10n.cpp | 3 +-- source/lib/sysdep/os/win/wsysdep.cpp | 5 +++-- source/ps/ArchiveBuilder.cpp | 4 ++-- source/ps/ConfigDB.cpp | 4 ++-- source/ps/ModIo.cpp | 6 ++++-- source/renderer/RenderModifiers.cpp | 4 +--- source/simulation2/system/ParamNode.cpp | 7 ++++--- source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/source/graphics/ColladaManager.cpp b/source/graphics/ColladaManager.cpp index 25a7912e09..7684cbe719 100644 --- a/source/graphics/ColladaManager.cpp +++ b/source/graphics/ColladaManager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -19,8 +19,6 @@ #include "ColladaManager.h" -#include - #include "graphics/ModelDef.h" #include "maths/MD5.h" #include "ps/CacheLoader.h" @@ -29,6 +27,8 @@ #include "ps/DllLoader.h" #include "ps/Filesystem.h" +#include + namespace Collada { #include "collada/DLL.h" diff --git a/source/graphics/TerrainTextureManager.cpp b/source/graphics/TerrainTextureManager.cpp index ccc0326662..f7fcfff6c8 100644 --- a/source/graphics/TerrainTextureManager.cpp +++ b/source/graphics/TerrainTextureManager.cpp @@ -33,7 +33,6 @@ #include "renderer/Renderer.h" #include -#include #include CTerrainTextureManager::CTerrainTextureManager(Renderer::Backend::IDevice* device) diff --git a/source/i18n/L10n.cpp b/source/i18n/L10n.cpp index 5a57e00b2c..62907e0451 100644 --- a/source/i18n/L10n.cpp +++ b/source/i18n/L10n.cpp @@ -33,8 +33,7 @@ #include "ps/Filesystem.h" #include "ps/GameSetup/GameSetup.h" -#include -#include +#include #include #include diff --git a/source/lib/sysdep/os/win/wsysdep.cpp b/source/lib/sysdep/os/win/wsysdep.cpp index fca5253b7a..6c59b3a726 100644 --- a/source/lib/sysdep/os/win/wsysdep.cpp +++ b/source/lib/sysdep/os/win/wsysdep.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -40,7 +40,8 @@ #include "lib/sysdep/os/win/wutil.h" #if CONFIG_ENABLE_BOOST -# include +# include +# include #endif #include diff --git a/source/ps/ArchiveBuilder.cpp b/source/ps/ArchiveBuilder.cpp index 6acb75e31b..f79d6fdf41 100644 --- a/source/ps/ArchiveBuilder.cpp +++ b/source/ps/ArchiveBuilder.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -27,7 +27,7 @@ #include "ps/XML/Xeromyces.h" #include "renderer/backend/dummy/Device.h" -#include +#include CArchiveBuilder::CArchiveBuilder(const OsPath& mod, const OsPath& tempdir) : m_TempDir(tempdir), m_NumBaseMods(0) diff --git a/source/ps/ConfigDB.cpp b/source/ps/ConfigDB.cpp index 5349860185..4bb772d44d 100644 --- a/source/ps/ConfigDB.cpp +++ b/source/ps/ConfigDB.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -25,7 +25,7 @@ #include "ps/CStr.h" #include "ps/Filesystem.h" -#include +#include #include #include diff --git a/source/ps/ModIo.cpp b/source/ps/ModIo.cpp index 89369c10a0..bbf3faaef4 100644 --- a/source/ps/ModIo.cpp +++ b/source/ps/ModIo.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -41,7 +41,9 @@ #include "scriptinterface/ScriptRequest.h" #include "scriptinterface/JSON.h" -#include +#include +#include +#include #include ModIo* g_ModIo = nullptr; diff --git a/source/renderer/RenderModifiers.cpp b/source/renderer/RenderModifiers.cpp index 49f224694f..d2c782b944 100644 --- a/source/renderer/RenderModifiers.cpp +++ b/source/renderer/RenderModifiers.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -33,8 +33,6 @@ #include "renderer/SceneRenderer.h" #include "renderer/ShadowMap.h" -#include - /////////////////////////////////////////////////////////////////////////////////////////////// // LitRenderModifier implementation diff --git a/source/simulation2/system/ParamNode.cpp b/source/simulation2/system/ParamNode.cpp index a136421c50..a49953ce9a 100644 --- a/source/simulation2/system/ParamNode.cpp +++ b/source/simulation2/system/ParamNode.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2022 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -27,11 +27,12 @@ #include "ps/XML/Xeromyces.h" #include "scriptinterface/ScriptRequest.h" +#include +#include +#include #include #include -#include - static CParamNode g_NullNode(false); CParamNode::CParamNode(bool isOk) : diff --git a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp index 96c57c7330..ec9372cfbf 100644 --- a/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp +++ b/source/tools/atlas/AtlasUI/ActorEditor/ActorEditor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 Wildfire Games. +/* Copyright (C) 2023 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -17,7 +17,7 @@ #include "precompiled.h" -#include +#include #include "ActorEditor.h"