From 3bdce1f33ed148f4061c32b3878d7b632abc53d5 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 15 Oct 2023 15:19:41 -0500 Subject: [PATCH] lower engine requirements back to c++17 standards, not c++20. --- Engine/source/CMakeLists.txt | 2 -- Engine/source/scene/sceneQueryUtil.h | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt index 7182fdd34..3ec15127a 100644 --- a/Engine/source/CMakeLists.txt +++ b/Engine/source/CMakeLists.txt @@ -340,7 +340,6 @@ if (TORQUE_DYNAMIC_LIBRARY AND NOT TORQUE_TESTING) target_compile_definitions(TorqueEngine PUBLIC ${TORQUE_COMPILE_DEFINITIONS}) target_link_libraries(TorqueEngine ${TORQUE_LINK_LIBRARIES}) target_include_directories(TorqueEngine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) - target_compile_features(TorqueEngine PRIVATE cxx_std_20) set(TORQUE_SOURCE_FILES "main/main.cpp") set(TORQUE_LINK_LIBRARIES TorqueEngine) @@ -409,7 +408,6 @@ if (TORQUE_TARGET_PROPERTIES) set_target_properties(${TORQUE_APP_NAME} PROPERTIES ${TORQUE_TARGET_PROPERTIES}) endif (TORQUE_TARGET_PROPERTIES) target_include_directories(${TORQUE_APP_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_BINARY_DIR}/temp" ${TORQUE_INCLUDE_DIRECTORIES}) -target_compile_features(${TORQUE_APP_NAME} PRIVATE cxx_std_20) if(TORQUE_TESTING) if(WIN32) diff --git a/Engine/source/scene/sceneQueryUtil.h b/Engine/source/scene/sceneQueryUtil.h index d7551ff22..c64d58c4d 100644 --- a/Engine/source/scene/sceneQueryUtil.h +++ b/Engine/source/scene/sceneQueryUtil.h @@ -80,14 +80,14 @@ struct SceneBinRange inline bool operator==(const SceneBinRange& other) const { - return dMemcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && - dMemcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0; + return memcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && + memcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0; } inline bool operator!=(const SceneBinRange& other) const { - if (dMemcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && - dMemcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0) + if (memcmp(minCoord, other.minCoord, sizeof(minCoord)) == 0 && + memcmp(maxCoord, other.maxCoord, sizeof(maxCoord)) == 0) return false; else return true;