From 9614395928a942f726a12217a5df8e7180cf8323 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Tue, 20 Feb 2018 16:11:48 -0800
Subject: [PATCH] Fix grpc++->grpcpp leftover files

---
 src/cpp/common/alarm.cc                         | 8 ++++----
 src/cpp/common/version_cc.cc                    | 2 +-
 templates/src/cpp/common/version_cc.cc.template | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cpp/common/alarm.cc b/src/cpp/common/alarm.cc
index 0eecbb62618..15a373d8a54 100644
--- a/src/cpp/common/alarm.cc
+++ b/src/cpp/common/alarm.cc
@@ -15,15 +15,15 @@
  *
  */
 
-#include <grpc++/alarm.h>
+#include <grpcpp/alarm.h>
 
 #include <memory>
 
-#include <grpc++/completion_queue.h>
-#include <grpc++/impl/grpc_library.h>
-#include <grpc++/support/time.h>
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
+#include <grpcpp/completion_queue.h>
+#include <grpcpp/impl/grpc_library.h>
+#include <grpcpp/support/time.h>
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/surface/completion_queue.h"
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 8bc926048fd..4ca6afd43f2 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -19,7 +19,7 @@
 /* This file is autogenerated from:
    templates/src/core/surface/version.c.template */
 
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 
 namespace grpc {
 grpc::string Version() { return "1.10.0-dev"; }
diff --git a/templates/src/cpp/common/version_cc.cc.template b/templates/src/cpp/common/version_cc.cc.template
index 98828787270..a3b0cf69a53 100644
--- a/templates/src/cpp/common/version_cc.cc.template
+++ b/templates/src/cpp/common/version_cc.cc.template
@@ -21,7 +21,7 @@
   /* This file is autogenerated from:
      templates/src/core/surface/version.c.template */
 
-  #include <grpc++/grpc++.h>
+  #include <grpcpp/grpcpp.h>
 
   namespace grpc {
   grpc::string Version() { return "${settings.cpp_version}"; }