Merge branch 'master' of github.com:sandstorm-io/capnproto

c++/src/capnp/capability.c++

@@ -61,10 +61,6 @@ ClientHook::ClientHook() {
   setGlobalBrokenCapFactoryForLayoutCpp(brokenCapFactory);
 }
 
-void* ClientHook::getLocalServer(_::CapabilityServerSetBase& capServerSet) {
-  return nullptr;
-}
-
 // =======================================================================================
 
 Capability::Client::Client(decltype(nullptr))

c++/src/capnp/layout.c++

@@ -55,6 +55,11 @@ void setGlobalBrokenCapFactoryForLayoutCpp(BrokenCapFactory& factory) {
 const uint ClientHook::NULL_CAPABILITY_BRAND = 0;
 // Defined here rather than capability.c++ so that we can safely call isNull() in this file.
 
+void* ClientHook::getLocalServer(_::CapabilityServerSetBase& capServerSet) {
+  // Defined here rather than capability.c++ because otherwise building with -fsanitize=vptr fails.
+  return nullptr;
+}
+
 namespace _ {  // private
 
 #endif  // !CAPNP_LITE