Merge branch 'no-more-bs' of github.com:ctiller/grpc into no-more-bs

3 years ago · 6259cef9aa
parent 5fe0512077 46568922ce
commit 6259cef9aa
2 changed files with 1 additions and 1 deletions
--- a/src/core/ext/transport/cronet/transport/cronet_transport.cc
+++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc
@ -26,6 +26,7 @@

 #include <new>
 #include <string>
+#include <type_traits>
 #include <utility>

 #include "absl/strings/match.h"
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@ -58,7 +58,6 @@
 #include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/cpp_impl_of.h"
 #include "src/core/lib/gprpp/debug_location.h"
-#include "src/core/lib/gprpp/manual_constructor.h"
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/call_combiner.h"