diff options
author | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2016-01-13 11:42:18 -0800 |
commit | b70206fe52ee6509f3f965bf2a95b2cbd321088d (patch) | |
tree | fa59a43171854465c89af72734d45350070b7366 /include/grpc++/client_context.h | |
parent | 295a7ce511f1a2145f70942f826d0e225c00ba62 (diff) | |
parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) |
Merge branch 'master' into release-0_12_master_merge
Diffstat (limited to 'include/grpc++/client_context.h')
-rw-r--r-- | include/grpc++/client_context.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index e286b437e4..25eeb3876f 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.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 @@ -76,13 +76,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; @@ -304,13 +304,13 @@ class ClientContext { 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; |