Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from BitShares FC #22

Closed
nathanielhourt wants to merge 693 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 693 Files changed 313 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 72bcc8a926 - Show all commits

4
include/fc/io/raw.hpp
View file

@ -184,7 +184,7 @@ namespace fc {
s.get(b); s.get(b);
v |= uint32_t(uint8_t(b) & 0x7f) << by; v |= uint32_t(uint8_t(b) & 0x7f) << by;
by += 7; by += 7;
} while( uint8_t(b) & 0x80 ); } while( (uint8_t(b) & 0x80) && by < 32 );
vi.value = ((v>>1) ^ (v>>31)) + (v&0x01); vi.value = ((v>>1) ^ (v>>31)) + (v&0x01);
vi.value = v&0x01 ? vi.value : -vi.value; vi.value = v&0x01 ? vi.value : -vi.value;
vi.value = -vi.value; vi.value = -vi.value;
@ -195,7 +195,7 @@ namespace fc {
s.get(b); s.get(b);
v |= uint64_t(uint8_t(b) & 0x7f) << by; v |= uint64_t(uint8_t(b) & 0x7f) << by;
by += 7; by += 7;
} while( uint8_t(b) & 0x80 ); } while( (uint8_t(b) & 0x80) && by < 64 );
vi.value = static_cast<uint64_t>(v); vi.value = static_cast<uint64_t>(v);
} }