Rename function to avoud future clash

sheenaqotj · Jul 19, 2017 · a5d557b · a5d557b
1 parent 30939f8
commit a5d557b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/src/cpp/client/secure_credentials.cc b/src/cpp/client/secure_credentials.cc
@@ -207,7 +207,7 @@ void MetadataCredentialsPluginWrapper::InvokePlugin(
 
 MetadataCredentialsPluginWrapper::MetadataCredentialsPluginWrapper(
     std::unique_ptr<MetadataCredentialsPlugin> plugin)
-    : thread_pool_(CreateThreadPool()), plugin_(std::move(plugin)) {}
+    : thread_pool_(CreateDefaultThreadPool()), plugin_(std::move(plugin)) {}
 
 std::shared_ptr<CallCredentials> MetadataCredentialsFromPlugin(
     std::unique_ptr<MetadataCredentialsPlugin> plugin) {

diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc
@@ -24,21 +24,17 @@
 
 namespace grpc {
 
-static ThreadPoolInterface* CreateDefaultThreadPool() {
+static ThreadPoolInterface* CreateDefaultThreadPoolImpl() {
   int cores = gpr_cpu_num_cores();
   if (!cores) cores = 4;
   return new DynamicThreadPool(cores);
 }
 
-static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPool;
+static CreateThreadPoolFunc g_ctp_impl = CreateDefaultThreadPoolImpl;
 
-ThreadPoolInterface* CreateThreadPool() {
-  return g_ctp_impl();
-}
+ThreadPoolInterface* CreateDefaultThreadPool() { return g_ctp_impl(); }
 
-void SetCreateThreadPool(CreateThreadPoolFunc func) {
-  g_ctp_impl = func;
-}
+void SetCreateThreadPool(CreateThreadPoolFunc func) { g_ctp_impl = func; }
 
 }  // namespace grpc
 

diff --git a/src/cpp/server/secure_server_credentials.h b/src/cpp/server/secure_server_credentials.h
@@ -39,7 +39,7 @@ class AuthMetadataProcessorAyncWrapper final {
 
   AuthMetadataProcessorAyncWrapper(
       const std::shared_ptr<AuthMetadataProcessor>& processor)
-      : thread_pool_(CreateThreadPool()), processor_(processor) {}
+      : thread_pool_(CreateDefaultThreadPool()), processor_(processor) {}
 
  private:
   void InvokeProcessor(grpc_auth_context* context, const grpc_metadata* md,

diff --git a/src/cpp/server/thread_pool_interface.h b/src/cpp/server/thread_pool_interface.h
@@ -36,7 +36,7 @@ class ThreadPoolInterface {
 typedef ThreadPoolInterface* (*CreateThreadPoolFunc)(void);
 void SetCreateThreadPool(CreateThreadPoolFunc func);
 
-ThreadPoolInterface* CreateThreadPool();
+ThreadPoolInterface* CreateDefaultThreadPool();
 
 }  // namespace grpc