Merge branch 'master' into server_callback

1 files changed, 6 insertions, 1 deletions

diff --git a/include/grpcpp/impl/codegen/server_interface.h b/include/grpcpp/impl/codegen/server_interface.h
index bde7740f44..8bfb10f704 100644
--- a/include/grpcpp/impl/codegen/server_interface.h
+++ b/include/grpcpp/impl/codegen/server_interface.h
@@ -333,7 +333,12 @@ class ServerInterface : public internal::CallHook {
   }
 
  private:
-  virtual const std::vector<
+  // EXPERIMENTAL
+  // Getter method for the vector of interceptor factory objects.
+  // Returns a nullptr (rather than being pure) since this is a new method and
+  // adding a new pure method to an interface would be a breaking change (even
+  // though this is private and non-API)
+  virtual std::vector<
       std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>*
   interceptor_creators() {
     return nullptr;