diff options
| author |  Yang Gao <yangg@google.com> | 2015-02-11 11:45:22 -0800 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-02-11 11:45:22 -0800 |
| commit | 99b07d1ea788ee126fa4b1aa8c84fb293147b177 (patch) | |
| tree | 089c726fa588db0ceff31bfba4c3bca8b4fd9c01 /src/cpp | |
| parent | eb8e7cd922a1c45fe581040a9138afa1f99f1404 (diff) | |
| parent | 04c8ff0245e9cd0372fdcc5e1d48388316c60185 (diff) | |
fix conflict
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/server/server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 02fb383394..6d014a55f3 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -142,7 +142,7 @@ class Server::MethodRequestData final : public CompletionQueueTag { cq_, this)); } - void FinalizeResult(void *tag, bool *status) override {} + void FinalizeResult(void **tag, bool *status) override {} class CallData { public: |