Skip to content
Snippets Groups Projects
Commit c049035b authored by Yuchen Zeng's avatar Yuchen Zeng
Browse files

Add GRPC_ prefix for macros

parent 018bf1a8
No related branches found
No related tags found
No related merge requests found
...@@ -64,12 +64,12 @@ class ServerBuilderPlugin { ...@@ -64,12 +64,12 @@ class ServerBuilderPlugin {
} // namespace grpc } // namespace grpc
#define DECLARE_PLUGIN(plugin_name) \ #define GRPC_DECLARE_PLUGIN(plugin_name) \
namespace sBP##plugin_name { \ namespace sBP##plugin_name { \
extern std::unique_ptr<ServerBuilderPlugin> Create##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 = \ std::unique_ptr<ServerBuilderPlugin> plugin = \
sBP##plugin_name::Create##plugin_name(); \ sBP##plugin_name::Create##plugin_name(); \
......
...@@ -147,7 +147,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> { ...@@ -147,7 +147,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
void InsertPlugin() { void InsertPlugin() {
if (GetParam()) { if (GetParam()) {
// Add ServerBuilder plugin directly // Add ServerBuilder plugin directly
INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin); GRPC_INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr); EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
} else { } else {
// Add ServerBuilder plugin using ServerBuilder::SetOption() // Add ServerBuilder plugin using ServerBuilder::SetOption()
...@@ -159,7 +159,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> { ...@@ -159,7 +159,7 @@ class ServerBuilderPluginTest : public ::testing::TestWithParam<bool> {
void InsertPluginWithTestService() { void InsertPluginWithTestService() {
if (GetParam()) { if (GetParam()) {
// Add ServerBuilder plugin directly // Add ServerBuilder plugin directly
INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin); GRPC_INIT_PLUGIN(builder_->plugins_, TestServerBuilderPlugin);
EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr); EXPECT_TRUE(builder_->plugins_[PLUGIN_NAME] != nullptr);
auto plugin = static_cast<TestServerBuilderPlugin*>( auto plugin = static_cast<TestServerBuilderPlugin*>(
builder_->plugins_[PLUGIN_NAME].get()); builder_->plugins_[PLUGIN_NAME].get());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment