From c23bbfb06875d9b26fb17542390446b43ef0e0bf Mon Sep 17 00:00:00 2001 From: SynaptiCAD User Date: Mon, 9 Jan 2017 10:53:34 -0500 Subject: [PATCH 1/2] Fix GetGitRevisionDescription to work with newer versions of git, which use absolute paths in the .git files of submodules --- GitVersionGen/GetGitRevisionDescription.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersionGen/GetGitRevisionDescription.cmake b/GitVersionGen/GetGitRevisionDescription.cmake index 00f8727..2b4a479 100644 --- a/GitVersionGen/GetGitRevisionDescription.cmake +++ b/GitVersionGen/GetGitRevisionDescription.cmake @@ -58,7 +58,7 @@ function(get_git_head_revision _refspecvar _hashvar) file(READ ${GIT_DIR} submodule) string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) - get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) + get_filename_component(GIT_DIR ${GIT_DIR_RELATIVE} ABSOLUTE BASE_DIR ${SUBMODULE_DIR}) endif() set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") if(NOT EXISTS "${GIT_DATA}") From 9d408aa53267834542279490eac4c25878107967 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 16 Nov 2016 14:47:30 -0500 Subject: [PATCH 2/2] Fix serialization of enums to use variable-length integerd --- include/fc/io/raw.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp index bc5cd22..46dcf4b 100644 --- a/include/fc/io/raw.hpp +++ b/include/fc/io/raw.hpp @@ -324,13 +324,13 @@ namespace fc { struct if_enum { template static inline void pack( Stream& s, const T& v ) { - fc::raw::pack(s, (int64_t)v); + fc::raw::pack(s, signed_int((int32_t)v)); } template static inline void unpack( Stream& s, T& v ) { - int64_t temp; + signed_int temp; fc::raw::unpack(s, temp); - v = (T)temp; + v = (T)temp.value; } };