Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface

1 files changed, 64 insertions, 63 deletions

diff --git a/grpc.gemspec b/grpc.gemspec
index 4f707926b1..b763649d8b 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -83,73 +83,72 @@ Gem::Specification.new do |s|
   s.files += %w( include/grpc/impl/codegen/sync_generic.h )
   s.files += %w( include/grpc/impl/codegen/sync_posix.h )
   s.files += %w( include/grpc/impl/codegen/sync_windows.h )
+  s.files += %w( src/core/lib/gpr++/abstract.h )
+  s.files += %w( src/core/lib/gpr++/atomic.h )
+  s.files += %w( src/core/lib/gpr++/atomic_with_atm.h )
+  s.files += %w( src/core/lib/gpr++/atomic_with_std.h )
+  s.files += %w( src/core/lib/gpr++/manual_constructor.h )
+  s.files += %w( src/core/lib/gpr++/memory.h )
+  s.files += %w( src/core/lib/gpr/arena.h )
+  s.files += %w( src/core/lib/gpr/env.h )
+  s.files += %w( src/core/lib/gpr/fork.h )
+  s.files += %w( src/core/lib/gpr/mpscq.h )
+  s.files += %w( src/core/lib/gpr/murmur_hash.h )
+  s.files += %w( src/core/lib/gpr/spinlock.h )
+  s.files += %w( src/core/lib/gpr/string.h )
+  s.files += %w( src/core/lib/gpr/string_windows.h )
+  s.files += %w( src/core/lib/gpr/thd_internal.h )
+  s.files += %w( src/core/lib/gpr/time_precise.h )
+  s.files += %w( src/core/lib/gpr/tmpfile.h )
   s.files += %w( src/core/lib/profiling/timers.h )
-  s.files += %w( src/core/lib/support/abstract.h )
-  s.files += %w( src/core/lib/support/arena.h )
-  s.files += %w( src/core/lib/support/atomic.h )
-  s.files += %w( src/core/lib/support/atomic_with_atm.h )
-  s.files += %w( src/core/lib/support/atomic_with_std.h )
-  s.files += %w( src/core/lib/support/env.h )
-  s.files += %w( src/core/lib/support/fork.h )
-  s.files += %w( src/core/lib/support/manual_constructor.h )
-  s.files += %w( src/core/lib/support/memory.h )
-  s.files += %w( src/core/lib/support/mpscq.h )
-  s.files += %w( src/core/lib/support/murmur_hash.h )
-  s.files += %w( src/core/lib/support/spinlock.h )
-  s.files += %w( src/core/lib/support/string.h )
-  s.files += %w( src/core/lib/support/string_windows.h )
-  s.files += %w( src/core/lib/support/thd_internal.h )
-  s.files += %w( src/core/lib/support/time_precise.h )
-  s.files += %w( src/core/lib/support/tmpfile.h )
+  s.files += %w( src/core/lib/gpr/alloc.cc )
+  s.files += %w( src/core/lib/gpr/arena.cc )
+  s.files += %w( src/core/lib/gpr/atm.cc )
+  s.files += %w( src/core/lib/gpr/avl.cc )
+  s.files += %w( src/core/lib/gpr/cmdline.cc )
+  s.files += %w( src/core/lib/gpr/cpu_iphone.cc )
+  s.files += %w( src/core/lib/gpr/cpu_linux.cc )
+  s.files += %w( src/core/lib/gpr/cpu_posix.cc )
+  s.files += %w( src/core/lib/gpr/cpu_windows.cc )
+  s.files += %w( src/core/lib/gpr/env_linux.cc )
+  s.files += %w( src/core/lib/gpr/env_posix.cc )
+  s.files += %w( src/core/lib/gpr/env_windows.cc )
+  s.files += %w( src/core/lib/gpr/fork.cc )
+  s.files += %w( src/core/lib/gpr/host_port.cc )
+  s.files += %w( src/core/lib/gpr/log.cc )
+  s.files += %w( src/core/lib/gpr/log_android.cc )
+  s.files += %w( src/core/lib/gpr/log_linux.cc )
+  s.files += %w( src/core/lib/gpr/log_posix.cc )
+  s.files += %w( src/core/lib/gpr/log_windows.cc )
+  s.files += %w( src/core/lib/gpr/mpscq.cc )
+  s.files += %w( src/core/lib/gpr/murmur_hash.cc )
+  s.files += %w( src/core/lib/gpr/string.cc )
+  s.files += %w( src/core/lib/gpr/string_posix.cc )
+  s.files += %w( src/core/lib/gpr/string_util_windows.cc )
+  s.files += %w( src/core/lib/gpr/string_windows.cc )
+  s.files += %w( src/core/lib/gpr/subprocess_posix.cc )
+  s.files += %w( src/core/lib/gpr/subprocess_windows.cc )
+  s.files += %w( src/core/lib/gpr/sync.cc )
+  s.files += %w( src/core/lib/gpr/sync_posix.cc )
+  s.files += %w( src/core/lib/gpr/sync_windows.cc )
+  s.files += %w( src/core/lib/gpr/thd.cc )
+  s.files += %w( src/core/lib/gpr/thd_posix.cc )
+  s.files += %w( src/core/lib/gpr/thd_windows.cc )
+  s.files += %w( src/core/lib/gpr/time.cc )
+  s.files += %w( src/core/lib/gpr/time_posix.cc )
+  s.files += %w( src/core/lib/gpr/time_precise.cc )
+  s.files += %w( src/core/lib/gpr/time_windows.cc )
+  s.files += %w( src/core/lib/gpr/tls_pthread.cc )
+  s.files += %w( src/core/lib/gpr/tmpfile_msys.cc )
+  s.files += %w( src/core/lib/gpr/tmpfile_posix.cc )
+  s.files += %w( src/core/lib/gpr/tmpfile_windows.cc )
+  s.files += %w( src/core/lib/gpr/wrap_memcpy.cc )
   s.files += %w( src/core/lib/profiling/basic_timers.cc )
   s.files += %w( src/core/lib/profiling/stap_timers.cc )
-  s.files += %w( src/core/lib/support/alloc.cc )
-  s.files += %w( src/core/lib/support/arena.cc )
-  s.files += %w( src/core/lib/support/atm.cc )
-  s.files += %w( src/core/lib/support/avl.cc )
-  s.files += %w( src/core/lib/support/cmdline.cc )
-  s.files += %w( src/core/lib/support/cpu_iphone.cc )
-  s.files += %w( src/core/lib/support/cpu_linux.cc )
-  s.files += %w( src/core/lib/support/cpu_posix.cc )
-  s.files += %w( src/core/lib/support/cpu_windows.cc )
-  s.files += %w( src/core/lib/support/env_linux.cc )
-  s.files += %w( src/core/lib/support/env_posix.cc )
-  s.files += %w( src/core/lib/support/env_windows.cc )
-  s.files += %w( src/core/lib/support/fork.cc )
-  s.files += %w( src/core/lib/support/host_port.cc )
-  s.files += %w( src/core/lib/support/log.cc )
-  s.files += %w( src/core/lib/support/log_android.cc )
-  s.files += %w( src/core/lib/support/log_linux.cc )
-  s.files += %w( src/core/lib/support/log_posix.cc )
-  s.files += %w( src/core/lib/support/log_windows.cc )
-  s.files += %w( src/core/lib/support/mpscq.cc )
-  s.files += %w( src/core/lib/support/murmur_hash.cc )
-  s.files += %w( src/core/lib/support/string.cc )
-  s.files += %w( src/core/lib/support/string_posix.cc )
-  s.files += %w( src/core/lib/support/string_util_windows.cc )
-  s.files += %w( src/core/lib/support/string_windows.cc )
-  s.files += %w( src/core/lib/support/subprocess_posix.cc )
-  s.files += %w( src/core/lib/support/subprocess_windows.cc )
-  s.files += %w( src/core/lib/support/sync.cc )
-  s.files += %w( src/core/lib/support/sync_posix.cc )
-  s.files += %w( src/core/lib/support/sync_windows.cc )
-  s.files += %w( src/core/lib/support/thd.cc )
-  s.files += %w( src/core/lib/support/thd_posix.cc )
-  s.files += %w( src/core/lib/support/thd_windows.cc )
-  s.files += %w( src/core/lib/support/time.cc )
-  s.files += %w( src/core/lib/support/time_posix.cc )
-  s.files += %w( src/core/lib/support/time_precise.cc )
-  s.files += %w( src/core/lib/support/time_windows.cc )
-  s.files += %w( src/core/lib/support/tls_pthread.cc )
-  s.files += %w( src/core/lib/support/tmpfile_msys.cc )
-  s.files += %w( src/core/lib/support/tmpfile_posix.cc )
-  s.files += %w( src/core/lib/support/tmpfile_windows.cc )
-  s.files += %w( src/core/lib/support/wrap_memcpy.cc )
   s.files += %w( include/grpc/impl/codegen/byte_buffer.h )
   s.files += %w( include/grpc/impl/codegen/byte_buffer_reader.h )
   s.files += %w( include/grpc/impl/codegen/compression_types.h )
   s.files += %w( include/grpc/impl/codegen/connectivity_state.h )
-  s.files += %w( include/grpc/impl/codegen/exec_ctx_fwd.h )
   s.files += %w( include/grpc/impl/codegen/grpc_types.h )
   s.files += %w( include/grpc/impl/codegen/propagation_bits.h )
   s.files += %w( include/grpc/impl/codegen/slice.h )
@@ -273,6 +272,11 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/compression/stream_compression_identity.h )
   s.files += %w( src/core/lib/debug/stats.h )
   s.files += %w( src/core/lib/debug/stats_data.h )
+  s.files += %w( src/core/lib/gpr++/debug_location.h )
+  s.files += %w( src/core/lib/gpr++/inlined_vector.h )
+  s.files += %w( src/core/lib/gpr++/orphanable.h )
+  s.files += %w( src/core/lib/gpr++/ref_counted.h )
+  s.files += %w( src/core/lib/gpr++/ref_counted_ptr.h )
   s.files += %w( src/core/lib/http/format_request.h )
   s.files += %w( src/core/lib/http/httpcli.h )
   s.files += %w( src/core/lib/http/parser.h )
@@ -348,9 +352,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/slice/slice_hash_table.h )
   s.files += %w( src/core/lib/slice/slice_internal.h )
   s.files += %w( src/core/lib/slice/slice_string_helpers.h )
-  s.files += %w( src/core/lib/support/debug_location.h )
-  s.files += %w( src/core/lib/support/ref_counted.h )
-  s.files += %w( src/core/lib/support/ref_counted_ptr.h )
   s.files += %w( src/core/lib/surface/alarm_internal.h )
   s.files += %w( src/core/lib/surface/api_trace.h )
   s.files += %w( src/core/lib/surface/call.h )