aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-12-01 22:52:20 +0100
committerGravatar Nicolas "Pixel" Noble <pixel@nobis-crew.org>2015-12-01 22:52:20 +0100
commitba404826be4720fc46ae161f950e27814928d5c5 (patch)
treeae21ff387782aaffab6e0c3cccd9aab6d629acfd /include
parent3e5cbee777cfd1d05f1161dfb97093878c7e48ed (diff)
Clang format.
Diffstat (limited to 'include')
-rw-r--r--include/grpc++/alarm.h2
-rw-r--r--include/grpc++/security/credentials.h8
2 files changed, 4 insertions, 6 deletions
diff --git a/include/grpc++/alarm.h b/include/grpc++/alarm.h
index 8cf7f59290..957d11c500 100644
--- a/include/grpc++/alarm.h
+++ b/include/grpc++/alarm.h
@@ -43,7 +43,7 @@
namespace grpc {
/// A thin wrapper around \a grpc_alarm (see / \a / src/core/surface/alarm.h).
-class Alarm: public GrpcLibrary {
+class Alarm : public GrpcLibrary {
public:
/// Create a completion queue alarm instance associated to \a cq.
///
diff --git a/include/grpc++/security/credentials.h b/include/grpc++/security/credentials.h
index ad3572c003..e5652dc184 100644
--- a/include/grpc++/security/credentials.h
+++ b/include/grpc++/security/credentials.h
@@ -187,9 +187,8 @@ std::shared_ptr<CallCredentials> GoogleIAMCredentials(
/// Combines a channel credentials and a call credentials into a composite
/// channel credentials.
std::shared_ptr<ChannelCredentials> CompositeChannelCredentials(
- const std::shared_ptr<ChannelCredentials>& channel_creds,
- const std::shared_ptr<CallCredentials>& call_creds);
-
+ const std::shared_ptr<ChannelCredentials>& channel_creds,
+ const std::shared_ptr<CallCredentials>& call_creds);
/// Combines two call credentials objects into a composite call credentials.
std::shared_ptr<CallCredentials> CompositeCallCredentials(
@@ -217,8 +216,7 @@ class MetadataCredentialsPlugin {
// The channel_auth_context contains (among other things), the identity of
// the server.
virtual Status GetMetadata(
- grpc::string_ref service_url,
- grpc::string_ref method_name,
+ grpc::string_ref service_url, grpc::string_ref method_name,
const AuthContext& channel_auth_context,
std::multimap<grpc::string, grpc::string>* metadata) = 0;
};