aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2015-03-12 05:12:46 -0700
committerGravatar Vijay Pai <vpai@google.com>2015-03-12 05:12:46 -0700
commit01f8f11ab092904e50f08780beda143252ee5e1c (patch)
treedf48a056fbfbf5957fe24d175975b1c9df1c24d6 /src
parentbf113f1561c37bf7a1f71390148b2e078a660f14 (diff)
parente3bbcca12c4936ca596d5ee49eaea37c7ab86502 (diff)
Merge pull request #1021 from Chilledheart/develop
Add missing GRPC_OVERRIDE, NFC
Diffstat (limited to 'src')
-rw-r--r--src/cpp/client/insecure_credentials.cc2
-rw-r--r--src/cpp/client/secure_credentials.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpp/client/insecure_credentials.cc b/src/cpp/client/insecure_credentials.cc
index 2dcfe69591..f3ca430bd4 100644
--- a/src/cpp/client/insecure_credentials.cc
+++ b/src/cpp/client/insecure_credentials.cc
@@ -54,7 +54,7 @@ class InsecureCredentialsImpl GRPC_FINAL : public Credentials {
target, grpc_channel_create(target.c_str(), &channel_args)));
}
- SecureCredentials* AsSecureCredentials() { return nullptr; }
+ SecureCredentials* AsSecureCredentials() GRPC_OVERRIDE { return nullptr; }
};
} // namespace
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
index 47f645c1b6..6ca702eead 100644
--- a/src/cpp/client/secure_credentials.cc
+++ b/src/cpp/client/secure_credentials.cc
@@ -59,7 +59,7 @@ class SecureCredentials GRPC_FINAL : public Credentials {
grpc_secure_channel_create(c_creds_, target.c_str(), &channel_args)));
}
- SecureCredentials* AsSecureCredentials() { return this; }
+ SecureCredentials* AsSecureCredentials() GRPC_OVERRIDE { return this; }
private:
grpc_credentials* const c_creds_;