From c9e052fe581cdd65ee7a05584288673e902110e0 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Mon, 6 Mar 2023 11:17:05 +0000 Subject: [PATCH] Updating flatbuffer library version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The file nano/ipc_flatbuffers_lib/generated/flatbuffers/nanoapi_generated.h will need to be regenerated by deleting the file and rebuilding. An error like: error: no matching function for call to ‘nanoapi::Envelope::VerifyField indicates the file has not been regenerated. Adding -DNOGDI flag for WIN32 to prevent the ERROR macro within wingdi.h from colliding with ProtoIdGapAction::ERROR --- CMakeLists.txt | 2 +- submodules/flatbuffers | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 689f62fc..22a423e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,7 @@ find_package(Threads) if(WIN32) find_library(PSAPI Psapi) add_definitions(-D_WIN32_WINNT=0x0600 -DWINVER=0x0600 -DMINIUPNP_STATICLIB - -D_CRT_SECURE_NO_WARNINGS /EHsc) + -D_CRT_SECURE_NO_WARNINGS -DNOGDI /EHsc) if(${USING_TSAN} OR ${USING_ASAN} diff --git a/submodules/flatbuffers b/submodules/flatbuffers index a9a295fe..01834de2 160000 --- a/submodules/flatbuffers +++ b/submodules/flatbuffers @@ -1 +1 @@ -Subproject commit a9a295fecf3fbd5a4f571f53b01f63202a3e2113 +Subproject commit 01834de25e4bf3975a9a00e816292b1ad0fe184b