sync to head and run clang-format again

1 files changed, 44 insertions, 40 deletions

diff --git a/include/grpc++/completion_queue.h b/include/grpc++/completion_queue.h
index d98a8bbd5f..cb4ce50e93 100644
--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@@ -89,46 +89,50 @@ class CompletionQueue {
   bool Next(void** tag, bool* ok) {
     return (AsyncNext(tag, ok, std::chrono::system_clock::time_point::max()) !=
             SHUTDOWN);
-  }
-
-  // Shutdown has to be called, and the CompletionQueue can only be
-  // destructed when false is returned from Next().
-  void Shutdown();
-
-  grpc_completion_queue* cq() { return cq_; }
-
- private:
-  // Friend synchronous wrappers so that they can access Pluck(), which is
-  // a semi-private API geared towards the synchronous implementation.
-  template <class R>
-  friend class ::grpc::ClientReader;
-  template <class W>
-  friend class ::grpc::ClientWriter;
-  template <class R, class W>
-  friend class ::grpc::ClientReaderWriter;
-  template <class R>
-  friend class ::grpc::ServerReader;
-  template <class W>
-  friend class ::grpc::ServerWriter;
-  template <class R, class W>
-  friend class ::grpc::ServerReaderWriter;
-  friend class ::grpc::Server;
-  friend class ::grpc::ServerContext;
-  friend Status BlockingUnaryCall(ChannelInterface* channel,
-                                  const RpcMethod& method,
-                                  ClientContext* context,
-                                  const grpc::protobuf::Message& request,
-                                  grpc::protobuf::Message* result);
-
-  // Wraps grpc_completion_queue_pluck.
-  // Cannot be mixed with calls to Next().
-  bool Pluck(CompletionQueueTag* tag);
-
-  // Does a single polling pluck on tag
-  void TryPluck(CompletionQueueTag* tag);
-
-  grpc_completion_queue* cq_;  // owned
-};
+
+    bool Next(void** tag, bool* ok) {
+      return (
+          AsyncNext(tag, ok, (std::chrono::system_clock::time_point::max)()) !=
+          SHUTDOWN);
+    }
+
+    // Shutdown has to be called, and the CompletionQueue can only be
+    // destructed when false is returned from Next().
+    void Shutdown();
+
+    grpc_completion_queue* cq() { return cq_; }
+
+   private:
+    // Friend synchronous wrappers so that they can access Pluck(), which is
+    // a semi-private API geared towards the synchronous implementation.
+    template <class R>
+    friend class ::grpc::ClientReader;
+    template <class W>
+    friend class ::grpc::ClientWriter;
+    template <class R, class W>
+    friend class ::grpc::ClientReaderWriter;
+    template <class R>
+    friend class ::grpc::ServerReader;
+    template <class W>
+    friend class ::grpc::ServerWriter;
+    template <class R, class W>
+    friend class ::grpc::ServerReaderWriter;
+    friend class ::grpc::Server;
+    friend class ::grpc::ServerContext;
+    friend Status BlockingUnaryCall(
+        ChannelInterface * channel, const RpcMethod& method,
+        ClientContext* context, const grpc::protobuf::Message& request,
+        grpc::protobuf::Message* result);
+
+    // Wraps grpc_completion_queue_pluck.
+    // Cannot be mixed with calls to Next().
+    bool Pluck(CompletionQueueTag * tag);
+
+    // Does a single polling pluck on tag
+    void TryPluck(CompletionQueueTag * tag);
+
+    grpc_completion_queue* cq_;  // owned
+  };
 
 }  // namespace grpc