Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Fix max call in keys manager #1503

Merged
merged 2 commits into from
Jun 27, 2018
Merged

Fix max call in keys manager #1503

merged 2 commits into from
Jun 27, 2018

Conversation

lebdron
Copy link
Contributor

@lebdron lebdron commented Jun 27, 2018

Description of the Change

Fix type incompatibility on 32-bit platforms (armv7, Windows build for x86) which caused build error.

Benefits

It compiles without errors on 32-bit platforms.

Possible Drawbacks

None.

@lebdron lebdron requested review from l4l and bakhtin June 27, 2018 07:07
@lebdron lebdron changed the title Fix/keys manager max Fix max call in keys manager Jun 27, 2018
@bakhtin
Copy link
Contributor

bakhtin commented Jun 27, 2018

Successfully compiled binaries after applying this patch on ARMv7 platform:

root@d29676a564e0:/opt/iroha_deps/iroha# file build/bin/iroha-cli 
build/bin/iroha-cli: ELF 32-bit LSB shared object, ARM, EABI5 version 1 (GNU/Linux), dynamically linked, interpreter /lib/ld-linux-armhf.so.3, for GNU/Linux 3.2.0, BuildID[sha1]=9d4847e33995a30e125b71a6555830cc7bc4fa91, not stripped
root@d29676a564e0:/opt/iroha_deps/iroha# file build/bin/irohad    
build/bin/irohad: ELF 32-bit LSB shared object, ARM, EABI5 version 1 (GNU/Linux), dynamically linked, interpreter /lib/ld-linux-armhf.so.3, for GNU/Linux 3.2.0, BuildID[sha1]=5cd9ab5b37008b1b79edb6475acfec8a0abe9cb7, with debug_info, not stripped

@l4l l4l added needs-review pr awaits review from maintainers infrastructure anything related to continious integration, building infrastructure, or cmake labels Jun 27, 2018
@l4l l4l removed the needs-review pr awaits review from maintainers label Jun 27, 2018
@lebdron lebdron merged commit fbff94e into develop Jun 27, 2018
@lebdron lebdron deleted the fix/keys-manager-max branch June 27, 2018 10:54
l4l pushed a commit that referenced this pull request Jul 25, 2018
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
l4l pushed a commit that referenced this pull request Jul 25, 2018
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
infrastructure anything related to continious integration, building infrastructure, or cmake
Development

Successfully merging this pull request may close these issues.

None yet

3 participants