scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

parameter deconfliction (#6282)

Browse Source 
Prevent compiler warnings caused by the `value` parameter of the external serializers hiding the `value` member of `std::integral_constant`.

Follow-up to #6276.
This commit is contained in:
Goober5000 authored and GitHub committed 2024-08-13 23:17:28 +02:00
1 parent 6da7830b7b
commit f7e934440c
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/scripting/ade_external_serializer.h
+3 -3
View File
@@ -18,19 +18,19 @@ namespace scripting {
template<>
struct ade_serializable_external<vec3d> : std::true_type {
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size);
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size);
static void deserialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, char* data_ptr, ubyte* data, int& offset);
};
template<>
struct ade_serializable_external<object_ship_wing_point_team> : std::true_type {
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size);
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size);
static void deserialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, char* data_ptr, ubyte* data, int& offset);
};
template<>
struct ade_serializable_external<object_h> : std::true_type {
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size);
static void serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size);
static void deserialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, char* data_ptr, ubyte* data, int& offset);
};
}
code/scripting/api/objs/object.cpp
+2 -2
View File
@@ -26,9 +26,9 @@
#include "network/multimsgs.h"
#include "network/multiutil.h"
void scripting::internal::ade_serializable_external<object_h>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size) {
void scripting::internal::ade_serializable_external<object_h>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size) {
object_h obj;
value.getValue(scripting::api::l_Object.Get(&obj));
luaValue.getValue(scripting::api::l_Object.Get(&obj));
const ushort& netsig = obj.isValid() ? obj.objp()->net_signature : 0;
ADD_USHORT(netsig);
}
code/scripting/api/objs/oswpt.cpp
+2 -2
View File
@@ -14,9 +14,9 @@
#include "network/multimsgs.h"
#include "network/multiutil.h"
void scripting::internal::ade_serializable_external<object_ship_wing_point_team>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size) {
void scripting::internal::ade_serializable_external<object_ship_wing_point_team>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size) {
object_ship_wing_point_team oswpt;
value.getValue(scripting::api::l_OSWPT.Get(&oswpt));
luaValue.getValue(scripting::api::l_OSWPT.Get(&oswpt));
uint8_t oswpttype = static_cast<uint8_t>(oswpt.type);
ADD_DATA(oswpttype);
switch (oswpt.type) {
code/scripting/api/objs/vecmath.cpp
+2 -2
View File
@@ -8,9 +8,9 @@
#include "network/multi.h"
#include "network/multimsgs.h"
void scripting::internal::ade_serializable_external<vec3d>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& value, ubyte* data, int& packet_size) {
void scripting::internal::ade_serializable_external<vec3d>::serialize(lua_State* /*L*/, const scripting::ade_table_entry& /*tableEntry*/, const luacpp::LuaValue& luaValue, ubyte* data, int& packet_size) {
vec3d vec;
value.getValue(scripting::api::l_Vector.Get(&vec));
luaValue.getValue(scripting::api::l_Vector.Get(&vec));
ADD_VECTOR(vec);
}