commit 057a2f8f7c04e37cbb18f677b09cb19cc21af0ec
author Jan Tattermusch <jtattermusch@users.noreply.github.com> Wed May 18 07:30:06 2016 -0700
committer Jan Tattermusch <jtattermusch@users.noreply.github.com> Wed May 18 07:30:06 2016 -0700
tree f9c44dfdc0ea0d88aca8b5d2a73108f826ffbbce
parent aa51f63da3686c5a36e473046e53eb0e3f5afa99
parent 73621357abc767b7dd4ea2d034942efb1a4353a1

Merge pull request #6445 from yang-g/unique_ptr_reset

Add an explicit base class pointer to avoid potential breakage.

include/grpc++/impl/codegen/call.h

diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h
index d081b7d..d457f03 100644
--- a/include/grpc++/impl/codegen/call.h
+++ b/include/grpc++/impl/codegen/call.h
@@ -329,8 +329,11 @@
 
   template <class R>
   void RecvMessage(R* message) {
-    deserialize_.reset(
-        new CallOpGenericRecvMessageHelper::DeserializeFuncType<R>(message));
+    // Use an explicit base class pointer to avoid resolution error in the
+    // following unique_ptr::reset for some old implementations.
+    CallOpGenericRecvMessageHelper::DeserializeFunc* func =
+        new CallOpGenericRecvMessageHelper::DeserializeFuncType<R>(message);
+    deserialize_.reset(func);
   }
 
   bool got_message;