Merge pull request #887 from evoskuil/master

Set preprocessor conformance in vc++.

Author: evoskuil

builds/msvc/properties/Common.props

@@ -27,7 +27,7 @@
 
       <!-- Language -->
       <!-- /Zc is conformance mode. -->
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /Zc:preprocessor %(AdditionalOptions)</AdditionalOptions>
       <EnforceTypeConversionRules>true</EnforceTypeConversionRules>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <OpenMPSupport>false</OpenMPSupport>

src/protocols/protocol_explore.cpp

@@ -76,14 +76,15 @@ bool protocol_explore::try_dispatch_object(const request& request) NOEXCEPT
 
     const auto& query = archive();
     const auto wit = params["witness"] != "false";
+    constexpr auto header_size = chain::header::serialized_size();
 
     if (is_json)
     {
         if (hd)
         {
             if (const auto ptr = query.get_header(query.to_header(hash)))
             {
-                send_json(request, value_from(ptr), ptr->serialized_size());
+                send_json(request, value_from(ptr), header_size);
                 return true;
             }
         }