Skip to content

Commit e68ff87

Browse files
committed
Build fix for AC 25
1 parent af79ba2 commit e68ff87

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function (SetCompilerOptions target)
44
target_compile_features (${target} PUBLIC cxx_std_14)
55
target_compile_options (${target} PUBLIC "$<$<CONFIG:Debug>:-DDEBUG>")
66
if (WIN32)
7-
target_compile_options (${target} PUBLIC /W4 /WX /wd4996 /Zc:wchar_t-)
7+
target_compile_options (${target} PUBLIC /W4 /WX /wd4996 /wd4499 /Zc:wchar_t-)
88
else ()
99
target_compile_options (${target} PUBLIC -Wall -Wextra -Werror -fvisibility=hidden
1010
-Wno-multichar

Src/ChangeGDLParametersOfElementsCommand.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,11 @@ GS::ObjectState ChangeGDLParametersOfElementsCommand::Execute (const GS::ObjectS
176176
API_ParamOwnerType paramOwner = {};
177177

178178
paramOwner.libInd = 0;
179+
#ifdef ServerMainVers_2600
179180
paramOwner.type = API_ObjectID;
181+
#else
182+
paramOwner.typeID = API_ObjectID;
183+
#endif
180184
paramOwner.guid = elemGuid;
181185

182186
err = ACAPI_Goodies (APIAny_OpenParametersID, &paramOwner);
@@ -262,8 +266,11 @@ GS::ObjectState ChangeGDLParametersOfElementsCommand::Execute (const GS::ObjectS
262266
API_ElementMemo memo = {};
263267

264268
ACAPI_ELEMENT_MASK_CLEAR (mask);
265-
269+
#ifdef ServerMainVers_2600
266270
switch (element.header.type.typeID) {
271+
#else
272+
switch (element.header.typeID) {
273+
#endif
267274
case API_ObjectID:
268275
element.object.xRatio = getParams.a;
269276
element.object.yRatio = getParams.b;

Src/GetGDLParametersOfElementsCommand.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,11 @@ GS::ObjectState GetGDLParametersOfElementsCommand::Execute (const GS::ObjectStat
311311

312312
API_ParamOwnerType paramOwner = {};
313313
paramOwner.libInd = 0;
314+
#ifdef ServerMainVers_2600
314315
paramOwner.type = API_ObjectID;
316+
#else
317+
paramOwner.typeID = API_ObjectID;
318+
#endif
315319
paramOwner.guid = elemGuid;
316320

317321
API_ElementMemo memo = {};

0 commit comments

Comments
 (0)