Skip to content

[pull] master from beyond-all-reason:master #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jun 23, 2026
Merged

[pull] master from beyond-all-reason:master #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1caa3c5
Convert `u8string_view` to `string` using explicit size
devgit238 Jun 23, 2026
2186ee4
Fix inconsistent class/struct forward declarations
devgit238 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rts/Rendering/IconHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "Rendering/GL/RenderBuffersFwd.h"
#include "Rendering/Textures/TextureAtlas.h"

class UnitDef;
struct UnitDef;
class CTextureRenderAtlas;

namespace icon {
Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/Misc/SmoothHeightMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace SmoothHeightMeshNamespace {
*/
class SmoothHeightMesh
{
friend class SmoothHeightMeshDrawer;
friend struct SmoothHeightMeshDrawer;

public:

Expand Down
4 changes: 2 additions & 2 deletions rts/Sim/MoveTypes/Components/MoveTypesComponents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "System/Ecs/Components/BaseComponents.h"
#include <System/Threading/ThreadPool.h>

struct CUnit;
struct CFeature;
class CUnit;
class CFeature;

namespace MoveTypes {

Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/MoveTypes/MoveDefHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CUnit;
class LuaTable;

namespace MoveTypes {
class CheckCollisionQuery;
struct CheckCollisionQuery;
}

namespace MoveDefs {
Expand Down
4 changes: 2 additions & 2 deletions rts/Sim/MoveTypes/Utils/UnitTrapCheckUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#ifndef UNIT_TRAP_CHECK_UTILS_H__
#define UNIT_TRAP_CHECK_UTILS_H__

struct CFeature;
struct CUnit;
class CFeature;
class CUnit;

namespace MoveTypes {
void RegisterFeatureForUnitTrapCheck(CFeature* object);
Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/Path/HAPFS/PathSearch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "System/float3.h"

class CSolidObject;
class MoveDef;
struct MoveDef;

namespace HAPFS {
struct PathSearch {
Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/Path/QTPFS/Components/PathSpeedModInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace QTPFS {

class INode;
struct INode;

struct NodeLayerSpeedInfoSweep {
static constexpr std::size_t page_size = MoveDefHandler::MAX_MOVE_DEFS;
Expand Down
2 changes: 1 addition & 1 deletion rts/System/FileSystem/FileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace Impl {
return std::string(reinterpret_cast<const char*>(utf8.c_str()));
}
RECOIL_FORCE_INLINE std::string StoreUTF8AsString(const std::u8string_view& utf8) {
return std::string(reinterpret_cast<const char*>(utf8.data()));
return std::string(reinterpret_cast<const char*>(utf8.data()), utf8.size());
}
RECOIL_FORCE_INLINE std::string StorePathAsString(const fs::path& path) {
return StoreUTF8AsString(path.u8string());
Expand Down