diff options
author | Dan Born <dborn+github@google.com> | 2016-01-20 14:16:29 -0800 |
---|---|---|
committer | Dan Born <dborn+github@google.com> | 2016-01-20 14:16:29 -0800 |
commit | beeb4c2ad75533848ac0fca545a3b4785d8fce57 (patch) | |
tree | eed3a91f80967ab90ae4cbc559503015bd3a0483 /include/grpc++/channel.h | |
parent | b13a69da41ddad7880f409c53d1f55982ee79ac5 (diff) | |
parent | 4c3c397bbea2acf023950f7470fe36d2e7322cc0 (diff) |
Merge branch 'master' into tcp_listener
Diffstat (limited to 'include/grpc++/channel.h')
-rw-r--r-- | include/grpc++/channel.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc++/channel.h b/include/grpc++/channel.h index d6d72a9cf9..541be1345f 100644 --- a/include/grpc++/channel.h +++ b/include/grpc++/channel.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -54,13 +54,13 @@ template <class R> class ClientReader; template <class W> class ClientWriter; -template <class R, class W> +template <class W, class R> class ClientReaderWriter; template <class R> class ClientAsyncReader; template <class W> class ClientAsyncWriter; -template <class R, class W> +template <class W, class R> class ClientAsyncReaderWriter; template <class R> class ClientAsyncResponseReader; @@ -98,13 +98,13 @@ class Channel GRPC_FINAL : public GrpcLibrary, friend class ::grpc::ClientReader; template <class W> friend class ::grpc::ClientWriter; - template <class R, class W> + template <class W, class R> friend class ::grpc::ClientReaderWriter; template <class R> friend class ::grpc::ClientAsyncReader; template <class W> friend class ::grpc::ClientAsyncWriter; - template <class R, class W> + template <class W, class R> friend class ::grpc::ClientAsyncReaderWriter; template <class R> friend class ::grpc::ClientAsyncResponseReader; |