From 5633d9281312e3903e35c2794ecb9d97e6afc59c Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@bitshares.org>
Date: Tue, 9 Jun 2015 14:11:57 -0400
Subject: [PATCH] Apply remaining win32 patches by @emfrias

---
 libraries/chain/CMakeLists.txt | 2 +-
 libraries/chain/db_maint.cpp   | 6 +-----
 libraries/chain/operations.cpp | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 5d1a7f31..a6fd1d07 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -55,5 +55,5 @@ target_include_directories( graphene_chain
                             PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 
 if(MSVC)
-  set_source_files_properties( database.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
+  set_source_files_properties( db_init.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
 endif(MSVC)
diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp
index 3466ecbc..df397870 100644
--- a/libraries/chain/db_maint.cpp
+++ b/libraries/chain/db_maint.cpp
@@ -153,11 +153,7 @@ void database::update_active_delegates()
 
          // total_votes is 64 bits. Subtract the number of leading low bits from 64 to get the number of useful bits,
          // then I want to keep the most significant 16 bits of what's left.
-#ifdef __GNUC__
-         int8_t bits_to_drop = std::max(int(64 - __builtin_clzll(total_votes)) - 16, 0);
-#else
-         int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes.value)) - 15, 0);
-#endif
+         int8_t bits_to_drop = std::max(int(boost::multiprecision::detail::find_msb(total_votes)) - 15, 0);
          for( const auto& weight : weights )
          {
             // Ensure that everyone has at least one vote. Zero weights aren't allowed.
diff --git a/libraries/chain/operations.cpp b/libraries/chain/operations.cpp
index a229d31d..07078acf 100644
--- a/libraries/chain/operations.cpp
+++ b/libraries/chain/operations.cpp
@@ -905,8 +905,8 @@ string memo_message::serialize() const
 
 memo_message memo_message::deserialize(const string& serial)
 {
-   FC_ASSERT( serial.size() >= sizeof(memo_message::checksum) );
    memo_message result;
+   FC_ASSERT( serial.size() >= sizeof(result.checksum) );
    result.checksum = ntohl((uint32_t&)(*serial.data()));
    result.text = serial.substr(sizeof(result.checksum));
    return result;