Skip to content

Commit 362e171

Browse files
committed
Fix compilation issues after update to GCC 15 (pt. 2)
This second part can be reverted when the Lua argument parser supports noexcept
1 parent f5e59ac commit 362e171

20 files changed

+52
-52
lines changed

Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ int CLuaAccountDefs::RemoveAccount(lua_State* luaVM)
515515
return 1;
516516
}
517517

518-
bool CLuaAccountDefs::SetAccountSerial(CAccount* account, std::string serial) noexcept
518+
bool CLuaAccountDefs::SetAccountSerial(CAccount* account, std::string serial)
519519
{
520520
return CStaticFunctionDefinitions::SetAccountSerial(account, serial);
521521
}

Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ class CLuaAccountDefs : public CLuaDefs
4848
LUA_DECLARE(SetAccountPassword);
4949
LUA_DECLARE(SetAccountData);
5050
LUA_DECLARE(CopyAccountData);
51-
static bool SetAccountSerial(CAccount* account, std::string serial) noexcept;
51+
static bool SetAccountSerial(CAccount* account, std::string serial);
5252
};

Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,28 +66,28 @@ std::variant<CBlip*, bool> CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM,
6666
return radarMarker;
6767
}
6868

69-
auto CLuaBlipDefs::GetBlipIcon(CBlip* radarMarker) noexcept
69+
auto CLuaBlipDefs::GetBlipIcon(CBlip* radarMarker)
7070
{
7171
return radarMarker->m_ucIcon;
7272
}
7373

74-
auto CLuaBlipDefs::GetBlipSize(CBlip* radarMarker) noexcept
74+
auto CLuaBlipDefs::GetBlipSize(CBlip* radarMarker)
7575
{
7676
return radarMarker->m_ucSize;
7777
}
7878

79-
auto CLuaBlipDefs::GetBlipColor(CBlip* radarMarker) noexcept
79+
auto CLuaBlipDefs::GetBlipColor(CBlip* radarMarker)
8080
{
8181
SColor color = radarMarker->GetColor();
8282
return CLuaMultiReturn<float, float, float, float>{color.R, color.G, color.B, color.A};
8383
}
8484

85-
auto CLuaBlipDefs::GetBlipOrdering(CBlip* radarMarker) noexcept
85+
auto CLuaBlipDefs::GetBlipOrdering(CBlip* radarMarker)
8686
{
8787
return radarMarker->m_sOrdering;
8888
}
8989

90-
auto CLuaBlipDefs::GetBlipVisibleDistance(CBlip* radarMarker) noexcept
90+
auto CLuaBlipDefs::GetBlipVisibleDistance(CBlip* radarMarker)
9191
{
9292
return radarMarker->m_usVisibleDistance;
9393
}

Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ class CLuaBlipDefs : public CLuaDefs
2424
static std::variant<CBlip*, bool> CreateBlipAttachedTo(lua_State* luaVM, CElement* entity, std::optional<std::uint8_t> icon, std::optional<std::uint8_t> size, std::optional<std::uint8_t> r, std::optional<std::uint8_t> g, std::optional<std::uint8_t> b, std::optional<std::uint8_t> a, std::optional<std::int16_t> ordering, std::optional<std::uint16_t> visibleDistance, std::optional<CElement*> visibleTo);
2525

2626
// Get functions
27-
static auto GetBlipIcon(CBlip* radarMarker) noexcept;
28-
static auto GetBlipSize(CBlip* radarMarker) noexcept;
29-
static auto GetBlipColor(CBlip* radarMarker) noexcept;
30-
static auto GetBlipOrdering(CBlip* radarMarker) noexcept;
31-
static auto GetBlipVisibleDistance(CBlip* radarMarker) noexcept;
27+
static auto GetBlipIcon(CBlip* radarMarker);
28+
static auto GetBlipSize(CBlip* radarMarker);
29+
static auto GetBlipColor(CBlip* radarMarker);
30+
static auto GetBlipOrdering(CBlip* radarMarker);
31+
static auto GetBlipVisibleDistance(CBlip* radarMarker);
3232

3333
// Set functions
3434
static bool SetBlipIcon(CElement* radarMarker, std::uint8_t icon);

Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2451,12 +2451,12 @@ int CLuaElementDefs::isElementCallPropagationEnabled(lua_State* luaVM)
24512451
return 1;
24522452
}
24532453

2454-
bool CLuaElementDefs::IsElementOnFire(CElement* element) noexcept
2454+
bool CLuaElementDefs::IsElementOnFire(CElement* element)
24552455
{
24562456
return element->IsOnFire();
24572457
}
24582458

2459-
bool CLuaElementDefs::SetElementOnFire(CElement* element, bool onFire) noexcept
2459+
bool CLuaElementDefs::SetElementOnFire(CElement* element, bool onFire)
24602460
{
24612461
return CStaticFunctionDefinitions::SetElementOnFire(element, onFire);
24622462
}

Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class CLuaElementDefs : public CLuaDefs
7777
LUA_DECLARE(addElementDataSubscriber);
7878
LUA_DECLARE(removeElementDataSubscriber);
7979
LUA_DECLARE(hasElementDataSubscriber);
80-
static bool IsElementOnFire(CElement* element) noexcept;
80+
static bool IsElementOnFire(CElement* element);
8181

8282
// Attachement
8383
LUA_DECLARE(attachElements);
@@ -107,5 +107,5 @@ class CLuaElementDefs : public CLuaDefs
107107
LUA_DECLARE(setElementFrozen);
108108
LUA_DECLARE(setLowLODElement);
109109
LUA_DECLARE(setElementCallPropagationEnabled);
110-
static bool SetElementOnFire(CElement* element, bool onFire) noexcept;
110+
static bool SetElementOnFire(CElement* element, bool onFire);
111111
};

Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ bool CLuaMarkerDefs::SetMarkerTargetArrowProperties(CMarker* marker, std::option
434434
return CStaticFunctionDefinitions::SetMarkerTargetArrowProperties(marker, color, size.value_or(marker->GetSize() * 0.625f));
435435
}
436436

437-
std::variant<CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float>, bool> CLuaMarkerDefs::GetMarkerTargetArrowProperties(CMarker* marker) noexcept
437+
std::variant<CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float>, bool> CLuaMarkerDefs::GetMarkerTargetArrowProperties(CMarker* marker)
438438
{
439439
if (!marker->HasTarget() || marker->GetMarkerType() != CMarker::TYPE_CHECKPOINT)
440440
return false;

Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ class CLuaMarkerDefs : public CLuaDefs
3737
LUA_DECLARE(SetMarkerTarget);
3838
LUA_DECLARE(SetMarkerIcon);
3939
static bool SetMarkerTargetArrowProperties(CMarker* marker, std::optional<std::uint8_t> r, std::optional<std::uint8_t> g, std::optional<std::uint8_t> b, std::optional<std::uint8_t> a, std::optional<float> size);
40-
static std::variant<CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float>, bool> GetMarkerTargetArrowProperties(CMarker* marker) noexcept;
40+
static std::variant<CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t, std::uint8_t, float>, bool> GetMarkerTargetArrowProperties(CMarker* marker);
4141
};

Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,17 +319,17 @@ bool CLuaObjectDefs::BreakObject(CObject* const pObject)
319319
return CStaticFunctionDefinitions::BreakObject(pObject);
320320
}
321321

322-
bool CLuaObjectDefs::RespawnObject(CObject* const pObject) noexcept
322+
bool CLuaObjectDefs::RespawnObject(CObject* const pObject)
323323
{
324324
return CStaticFunctionDefinitions::RespawnObject(pObject);
325325
}
326326

327-
bool CLuaObjectDefs::ToggleObjectRespawn(CObject* const pObject, const bool bRespawn) noexcept
327+
bool CLuaObjectDefs::ToggleObjectRespawn(CObject* const pObject, const bool bRespawn)
328328
{
329329
return CStaticFunctionDefinitions::ToggleObjectRespawn(pObject, bRespawn);
330330
}
331331

332-
bool CLuaObjectDefs::IsObjectRespawnable(CObject* const pObject) noexcept
332+
bool CLuaObjectDefs::IsObjectRespawnable(CObject* const pObject)
333333
{
334334
return pObject->IsRespawnEnabled();
335335
}

Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ class CLuaObjectDefs : public CLuaDefs
2020

2121
// Object create/destroy functions
2222
LUA_DECLARE(CreateObject);
23-
static bool RespawnObject(CObject* const pObject) noexcept;
23+
static bool RespawnObject(CObject* const pObject);
2424

2525
// Object get functions
2626
LUA_DECLARE(GetObjectName);
2727
LUA_DECLARE(GetObjectRotation);
2828
LUA_DECLARE(GetObjectScale);
2929
static bool IsObjectBreakable(CObject* const pObject);
3030
static bool IsObjectMoving(CObject* const pObject);
31-
static bool IsObjectRespawnable(CObject* const pObject) noexcept;
31+
static bool IsObjectRespawnable(CObject* const pObject);
3232

3333
// Object set functions
3434
LUA_DECLARE(SetObjectName);
@@ -38,5 +38,5 @@ class CLuaObjectDefs : public CLuaDefs
3838
LUA_DECLARE(MoveObject);
3939
LUA_DECLARE(StopObject);
4040
static bool BreakObject(CObject* const pObject);
41-
static bool ToggleObjectRespawn(CObject* const pObject, const bool bRespawn) noexcept;
41+
static bool ToggleObjectRespawn(CObject* const pObject, const bool bRespawn);
4242
};

0 commit comments

Comments
 (0)