From c049035bedad8e013a439bf2934d01e616da4227 Mon Sep 17 00:00:00 2001
From: Yuchen Zeng <zyc@google.com>
Date: Fri, 29 Apr 2016 14:05:08 -0700
Subject: [PATCH] Add GRPC_ prefix for macros
---
include/grpc++/impl/server_builder_plugin.h | 4 ++--
test/cpp/end2end/server_builder_plugin_test.cc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/grpc++/impl/server_builder_plugin.h b/include/grpc++/impl/server_builder_plugin.h
index 2cf1dfdbec..7cf369e346 100644
--- a/include/grpc++/impl/server_builder_plugin.h
+++ b/include/grpc++/impl/server_builder_plugin.h
@@ -64,12 +64,12 @@ class ServerBuilderPlugin {
} // namespace grpc
-#define DECLARE_PLUGIN(plugin_name) \
+#define GRPC_DECLARE_PLUGIN(plugin_name) \
namespace sBP##plugin_name { \
extern std::unique_ptr<ServerBuilderPlugin> Create##plugin_name(); \
}
-#define INIT_PLUGIN(map, plugin_name) \
+#define GRPC_INIT_PLUGIN(map, plugin_name) \
{ \
std::unique_ptr<ServerBuilderPlugin> plugin = \
sBP##plugin_name::Create##plugin_name(); \
diff --git a/test/cpp/end2end/server_builder_plugin_test.cc b/test/cpp/end2end/server_builder_plugin_test.cc
index bebf1d1979..9ed176d29d 100644
--- a/test/cpp/end2end/server_builder_plugin_test.cc
+++ b/test/cpp/end2end/server_builder_plugin_test.cc
@@ -147,7 +147,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
void InsertPlugin() {
if (GetParam()) {
// Add ServerBuilder plugin directly
- INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
+ GRPC_INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
} else {
// Add ServerBuilder plugin using ServerBuilder::SetOption()
@@ -159,7 +159,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
void InsertPluginWithTestService() {
if (GetParam()) {
// Add ServerBuilder plugin directly
- INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
+ GRPC_INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
auto plugin = static_cast<TestServerBuilderPlugin*>(
builder_->plugins_[PLUGIN_NAME].get());
--
GitLab