diff options
| author |  Mark D. Roth <roth@google.com> | 2018-01-19 12:12:23 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-01-19 13:04:59 -0800 |
| commit | 4f2b0fdadfb1e1eb6c796c40ec5aabfbb348aa89 (patch) | |
| tree | e2355c86578b52fa4e36d8000fcc09d702c3d2fe | |
| parent | bb2f7e28edc3e3dd663ad308aed7ed632a0a17bf (diff) | |
Rename 'gpr++' directories to 'gprpp'.
43 files changed, 226 insertions, 217 deletions
@@ -548,9 +548,9 @@ grpc_cc_library( name = "gpr++_base", language = "c++", public_hdrs = [ - "src/core/lib/gpr++/abstract.h", - "src/core/lib/gpr++/manual_constructor.h", - "src/core/lib/gpr++/memory.h", + "src/core/lib/gprpp/abstract.h", + "src/core/lib/gprpp/manual_constructor.h", + "src/core/lib/gprpp/memory.h", ], ) @@ -558,11 +558,11 @@ grpc_cc_library( name = "atomic", language = "c++", public_hdrs = [ - "src/core/lib/gpr++/atomic.h", + "src/core/lib/gprpp/atomic.h", ], hdrs = [ - "src/core/lib/gpr++/atomic_with_atm.h", - "src/core/lib/gpr++/atomic_with_std.h", + "src/core/lib/gprpp/atomic_with_atm.h", + "src/core/lib/gprpp/atomic_with_std.h", ], deps = [ "gpr", @@ -573,22 +573,26 @@ grpc_cc_library( name = "inlined_vector", language = "c++", public_hdrs = [ - "src/core/lib/gpr++/inlined_vector.h", + "src/core/lib/gprpp/inlined_vector.h", + ], + deps = [ + "gpr++_base", ], ) grpc_cc_library( name = "debug_location", language = "c++", - public_hdrs = ["src/core/lib/gpr++/debug_location.h"], + public_hdrs = ["src/core/lib/gprpp/debug_location.h"], ) grpc_cc_library( name = "orphanable", language = "c++", - public_hdrs = ["src/core/lib/gpr++/orphanable.h"], + public_hdrs = ["src/core/lib/gprpp/orphanable.h"], deps = [ "debug_location", + "gpr++_base", "grpc_trace", ], ) @@ -596,9 +600,10 @@ grpc_cc_library( grpc_cc_library( name = "ref_counted", language = "c++", - public_hdrs = ["src/core/lib/gpr++/ref_counted.h"], + public_hdrs = ["src/core/lib/gprpp/ref_counted.h"], deps = [ "debug_location", + "gpr++_base", "grpc_trace", ], ) @@ -606,7 +611,10 @@ grpc_cc_library( grpc_cc_library( name = "ref_counted_ptr", language = "c++", - public_hdrs = ["src/core/lib/gpr++/ref_counted_ptr.h"], + public_hdrs = ["src/core/lib/gprpp/ref_counted_ptr.h"], + deps = [ + "gpr++_base", + ], ) grpc_cc_library( diff --git a/CMakeLists.txt b/CMakeLists.txt index 4450a73e9d..c3fc489b42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5785,7 +5785,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(gpr_manual_constructor_test - test/core/gpr++/manual_constructor_test.cc + test/core/gprpp/manual_constructor_test.cc ) @@ -10556,7 +10556,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(inlined_vector_test - test/core/gpr++/inlined_vector_test.cc + test/core/gprpp/inlined_vector_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) @@ -10801,7 +10801,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(memory_test - test/core/gpr++/memory_test.cc + test/core/gprpp/memory_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) @@ -10952,7 +10952,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(orphanable_test - test/core/gpr++/orphanable_test.cc + test/core/gprpp/orphanable_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) @@ -11352,7 +11352,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(ref_counted_ptr_test - test/core/gpr++/ref_counted_ptr_test.cc + test/core/gprpp/ref_counted_ptr_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) @@ -11389,7 +11389,7 @@ endif (gRPC_BUILD_TESTS) if (gRPC_BUILD_TESTS) add_executable(ref_counted_test - test/core/gpr++/ref_counted_test.cc + test/core/gprpp/ref_counted_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc ) @@ -10049,7 +10049,7 @@ endif GPR_MANUAL_CONSTRUCTOR_TEST_SRC = \ - test/core/gpr++/manual_constructor_test.cc \ + test/core/gprpp/manual_constructor_test.cc \ GPR_MANUAL_CONSTRUCTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(GPR_MANUAL_CONSTRUCTOR_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -10069,7 +10069,7 @@ $(BINDIR)/$(CONFIG)/gpr_manual_constructor_test: $(GPR_MANUAL_CONSTRUCTOR_TEST_O endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/manual_constructor_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/manual_constructor_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_gpr_manual_constructor_test: $(GPR_MANUAL_CONSTRUCTOR_TEST_OBJS:.o=.dep) @@ -15779,7 +15779,7 @@ endif INLINED_VECTOR_TEST_SRC = \ - test/core/gpr++/inlined_vector_test.cc \ + test/core/gprpp/inlined_vector_test.cc \ INLINED_VECTOR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(INLINED_VECTOR_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -15810,7 +15810,7 @@ endif endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/inlined_vector_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/inlined_vector_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_inlined_vector_test: $(INLINED_VECTOR_TEST_OBJS:.o=.dep) @@ -16013,7 +16013,7 @@ endif MEMORY_TEST_SRC = \ - test/core/gpr++/memory_test.cc \ + test/core/gprpp/memory_test.cc \ MEMORY_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(MEMORY_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -16044,7 +16044,7 @@ endif endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/memory_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/memory_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_memory_test: $(MEMORY_TEST_OBJS:.o=.dep) @@ -16190,7 +16190,7 @@ endif ORPHANABLE_TEST_SRC = \ - test/core/gpr++/orphanable_test.cc \ + test/core/gprpp/orphanable_test.cc \ ORPHANABLE_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(ORPHANABLE_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -16221,7 +16221,7 @@ endif endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/orphanable_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/orphanable_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_orphanable_test: $(ORPHANABLE_TEST_OBJS:.o=.dep) @@ -16597,7 +16597,7 @@ $(OBJDIR)/$(CONFIG)/test/cpp/interop/reconnect_interop_server.o: $(GENDIR)/src/p REF_COUNTED_PTR_TEST_SRC = \ - test/core/gpr++/ref_counted_ptr_test.cc \ + test/core/gprpp/ref_counted_ptr_test.cc \ REF_COUNTED_PTR_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_PTR_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -16628,7 +16628,7 @@ endif endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/ref_counted_ptr_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/ref_counted_ptr_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_ref_counted_ptr_test: $(REF_COUNTED_PTR_TEST_OBJS:.o=.dep) @@ -16640,7 +16640,7 @@ endif REF_COUNTED_TEST_SRC = \ - test/core/gpr++/ref_counted_test.cc \ + test/core/gprpp/ref_counted_test.cc \ REF_COUNTED_TEST_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(REF_COUNTED_TEST_SRC)))) ifeq ($(NO_SECURE),true) @@ -16671,7 +16671,7 @@ endif endif -$(OBJDIR)/$(CONFIG)/test/core/gpr++/ref_counted_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a +$(OBJDIR)/$(CONFIG)/test/core/gprpp/ref_counted_test.o: $(LIBDIR)/$(CONFIG)/libgrpc_test_util.a $(LIBDIR)/$(CONFIG)/libgrpc++.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a deps_ref_counted_test: $(REF_COUNTED_TEST_OBJS:.o=.dep) diff --git a/build.yaml b/build.yaml index a8639a8b0b..5a16d7d701 100644 --- a/build.yaml +++ b/build.yaml @@ -101,12 +101,6 @@ filegroups: - include/grpc/support/tls_pthread.h - include/grpc/support/useful.h headers: - - src/core/lib/gpr++/abstract.h - - src/core/lib/gpr++/atomic.h - - src/core/lib/gpr++/atomic_with_atm.h - - src/core/lib/gpr++/atomic_with_std.h - - src/core/lib/gpr++/manual_constructor.h - - src/core/lib/gpr++/memory.h - src/core/lib/gpr/arena.h - src/core/lib/gpr/env.h - src/core/lib/gpr/fork.h @@ -118,6 +112,12 @@ filegroups: - src/core/lib/gpr/thd_internal.h - src/core/lib/gpr/time_precise.h - src/core/lib/gpr/tmpfile.h + - src/core/lib/gprpp/abstract.h + - src/core/lib/gprpp/atomic.h + - src/core/lib/gprpp/atomic_with_atm.h + - src/core/lib/gprpp/atomic_with_std.h + - src/core/lib/gprpp/manual_constructor.h + - src/core/lib/gprpp/memory.h - src/core/lib/profiling/timers.h uses: - gpr_codegen @@ -321,11 +321,11 @@ filegroups: - src/core/lib/compression/stream_compression_identity.h - src/core/lib/debug/stats.h - src/core/lib/debug/stats_data.h - - src/core/lib/gpr++/debug_location.h - - src/core/lib/gpr++/inlined_vector.h - - src/core/lib/gpr++/orphanable.h - - src/core/lib/gpr++/ref_counted.h - - src/core/lib/gpr++/ref_counted_ptr.h + - src/core/lib/gprpp/debug_location.h + - src/core/lib/gprpp/inlined_vector.h + - src/core/lib/gprpp/orphanable.h + - src/core/lib/gprpp/ref_counted.h + - src/core/lib/gprpp/ref_counted_ptr.h - src/core/lib/http/format_request.h - src/core/lib/http/httpcli.h - src/core/lib/http/parser.h @@ -2188,7 +2188,7 @@ targets: build: test language: c src: - - test/core/gpr++/manual_constructor_test.cc + - test/core/gprpp/manual_constructor_test.cc deps: - gpr_test_util - gpr @@ -4265,7 +4265,7 @@ targets: build: test language: c++ src: - - test/core/gpr++/inlined_vector_test.cc + - test/core/gprpp/inlined_vector_test.cc deps: - grpc_test_util - grpc++ @@ -4371,7 +4371,7 @@ targets: build: test language: c++ src: - - test/core/gpr++/memory_test.cc + - test/core/gprpp/memory_test.cc deps: - grpc_test_util - grpc++ @@ -4423,7 +4423,7 @@ targets: build: test language: c++ src: - - test/core/gpr++/orphanable_test.cc + - test/core/gprpp/orphanable_test.cc deps: - grpc_test_util - grpc++ @@ -4576,7 +4576,7 @@ targets: build: test language: c++ src: - - test/core/gpr++/ref_counted_ptr_test.cc + - test/core/gprpp/ref_counted_ptr_test.cc deps: - grpc_test_util - grpc++ @@ -4590,7 +4590,7 @@ targets: build: test language: c++ src: - - test/core/gpr++/ref_counted_test.cc + - test/core/gprpp/ref_counted_test.cc deps: - grpc_test_util - grpc++ diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ccaa21194b..3ebd121e4c 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -192,13 +192,7 @@ Pod::Spec.new do |s| ss.dependency 'nanopb', '~> 0.3' # To save you from scrolling, this is the last part of the podspec. - ss.source_files = 'src/core/lib/gpr++/abstract.h', - 'src/core/lib/gpr++/atomic.h', - 'src/core/lib/gpr++/atomic_with_atm.h', - 'src/core/lib/gpr++/atomic_with_std.h', - 'src/core/lib/gpr++/manual_constructor.h', - 'src/core/lib/gpr++/memory.h', - 'src/core/lib/gpr/arena.h', + ss.source_files = 'src/core/lib/gpr/arena.h', 'src/core/lib/gpr/env.h', 'src/core/lib/gpr/fork.h', 'src/core/lib/gpr/mpscq.h', @@ -209,6 +203,12 @@ Pod::Spec.new do |s| 'src/core/lib/gpr/thd_internal.h', 'src/core/lib/gpr/time_precise.h', 'src/core/lib/gpr/tmpfile.h', + 'src/core/lib/gprpp/abstract.h', + 'src/core/lib/gprpp/atomic.h', + 'src/core/lib/gprpp/atomic_with_atm.h', + 'src/core/lib/gprpp/atomic_with_std.h', + 'src/core/lib/gprpp/manual_constructor.h', + 'src/core/lib/gprpp/memory.h', 'src/core/lib/profiling/timers.h', 'src/core/lib/gpr/alloc.cc', 'src/core/lib/gpr/arena.cc', @@ -344,11 +344,11 @@ Pod::Spec.new do |s| 'src/core/lib/compression/stream_compression_identity.h', 'src/core/lib/debug/stats.h', 'src/core/lib/debug/stats_data.h', - 'src/core/lib/gpr++/debug_location.h', - 'src/core/lib/gpr++/inlined_vector.h', - 'src/core/lib/gpr++/orphanable.h', - 'src/core/lib/gpr++/ref_counted.h', - 'src/core/lib/gpr++/ref_counted_ptr.h', + 'src/core/lib/gprpp/debug_location.h', + 'src/core/lib/gprpp/inlined_vector.h', + 'src/core/lib/gprpp/orphanable.h', + 'src/core/lib/gprpp/ref_counted.h', + 'src/core/lib/gprpp/ref_counted_ptr.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/parser.h', @@ -718,13 +718,7 @@ Pod::Spec.new do |s| 'src/core/ext/filters/workarounds/workaround_utils.cc', 'src/core/plugin_registry/grpc_plugin_registry.cc' - ss.private_header_files = 'src/core/lib/gpr++/abstract.h', - 'src/core/lib/gpr++/atomic.h', - 'src/core/lib/gpr++/atomic_with_atm.h', - 'src/core/lib/gpr++/atomic_with_std.h', - 'src/core/lib/gpr++/manual_constructor.h', - 'src/core/lib/gpr++/memory.h', - 'src/core/lib/gpr/arena.h', + ss.private_header_files = 'src/core/lib/gpr/arena.h', 'src/core/lib/gpr/env.h', 'src/core/lib/gpr/fork.h', 'src/core/lib/gpr/mpscq.h', @@ -735,6 +729,12 @@ Pod::Spec.new do |s| 'src/core/lib/gpr/thd_internal.h', 'src/core/lib/gpr/time_precise.h', 'src/core/lib/gpr/tmpfile.h', + 'src/core/lib/gprpp/abstract.h', + 'src/core/lib/gprpp/atomic.h', + 'src/core/lib/gprpp/atomic_with_atm.h', + 'src/core/lib/gprpp/atomic_with_std.h', + 'src/core/lib/gprpp/manual_constructor.h', + 'src/core/lib/gprpp/memory.h', 'src/core/lib/profiling/timers.h', 'src/core/ext/transport/chttp2/transport/bin_decoder.h', 'src/core/ext/transport/chttp2/transport/bin_encoder.h', @@ -826,11 +826,11 @@ Pod::Spec.new do |s| 'src/core/lib/compression/stream_compression_identity.h', 'src/core/lib/debug/stats.h', 'src/core/lib/debug/stats_data.h', - 'src/core/lib/gpr++/debug_location.h', - 'src/core/lib/gpr++/inlined_vector.h', - 'src/core/lib/gpr++/orphanable.h', - 'src/core/lib/gpr++/ref_counted.h', - 'src/core/lib/gpr++/ref_counted_ptr.h', + 'src/core/lib/gprpp/debug_location.h', + 'src/core/lib/gprpp/inlined_vector.h', + 'src/core/lib/gprpp/orphanable.h', + 'src/core/lib/gprpp/ref_counted.h', + 'src/core/lib/gprpp/ref_counted_ptr.h', 'src/core/lib/http/format_request.h', 'src/core/lib/http/httpcli.h', 'src/core/lib/http/parser.h', diff --git a/grpc.gemspec b/grpc.gemspec index 5b1aebeaaa..35b2776eba 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -83,12 +83,6 @@ 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 ) @@ -100,6 +94,12 @@ Gem::Specification.new do |s| 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/gprpp/abstract.h ) + s.files += %w( src/core/lib/gprpp/atomic.h ) + s.files += %w( src/core/lib/gprpp/atomic_with_atm.h ) + s.files += %w( src/core/lib/gprpp/atomic_with_std.h ) + s.files += %w( src/core/lib/gprpp/manual_constructor.h ) + s.files += %w( src/core/lib/gprpp/memory.h ) s.files += %w( src/core/lib/profiling/timers.h ) s.files += %w( src/core/lib/gpr/alloc.cc ) s.files += %w( src/core/lib/gpr/arena.cc ) @@ -270,11 +270,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/gprpp/debug_location.h ) + s.files += %w( src/core/lib/gprpp/inlined_vector.h ) + s.files += %w( src/core/lib/gprpp/orphanable.h ) + s.files += %w( src/core/lib/gprpp/ref_counted.h ) + s.files += %w( src/core/lib/gprpp/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 ) diff --git a/package.xml b/package.xml index f1282964c2..875120c6e4 100644 --- a/package.xml +++ b/package.xml @@ -95,12 +95,6 @@ <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_generic.h" role="src" /> <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_posix.h" role="src" /> <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_windows.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/abstract.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/atomic.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/atomic_with_atm.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/atomic_with_std.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/manual_constructor.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/memory.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/arena.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/env.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/fork.h" role="src" /> @@ -112,6 +106,12 @@ <file baseinstalldir="/" name="src/core/lib/gpr/thd_internal.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/time_precise.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/tmpfile.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/abstract.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/atomic.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/atomic_with_atm.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/atomic_with_std.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/manual_constructor.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/memory.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/profiling/timers.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/alloc.cc" role="src" /> <file baseinstalldir="/" name="src/core/lib/gpr/arena.cc" role="src" /> @@ -282,11 +282,11 @@ <file baseinstalldir="/" name="src/core/lib/compression/stream_compression_identity.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/debug/stats.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/debug/stats_data.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/debug_location.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/inlined_vector.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/orphanable.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/ref_counted.h" role="src" /> - <file baseinstalldir="/" name="src/core/lib/gpr++/ref_counted_ptr.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/debug_location.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/inlined_vector.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/orphanable.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/ref_counted.h" role="src" /> + <file baseinstalldir="/" name="src/core/lib/gprpp/ref_counted_ptr.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/http/format_request.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/http/httpcli.h" role="src" /> <file baseinstalldir="/" name="src/core/lib/http/parser.h" role="src" /> diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h index e19726efb3..30660cb83d 100644 --- a/src/core/ext/filters/client_channel/lb_policy.h +++ b/src/core/ext/filters/client_channel/lb_policy.h @@ -20,7 +20,7 @@ #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_H #include "src/core/ext/filters/client_channel/subchannel.h" -#include "src/core/lib/gpr++/ref_counted_ptr.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index eb5ced4c20..b89a28c077 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -106,8 +106,8 @@ #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gpr++/manual_constructor.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/sockaddr_utils.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc index e217a0b0c0..24c381a46d 100644 --- a/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc +++ b/src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc @@ -34,7 +34,7 @@ #include "src/core/ext/filters/client_channel/subchannel_index.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gpr++/ref_counted_ptr.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/transport/connectivity_state.h" diff --git a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h index f4e345def6..3377605263 100644 --- a/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h +++ b/src/core/ext/filters/client_channel/lb_policy/subchannel_list.h @@ -22,7 +22,7 @@ #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/ext/filters/client_channel/subchannel.h" #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gpr++/ref_counted_ptr.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/transport/connectivity_state.h" // TODO(roth): This code is intended to be shared between pick_first and diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc index 7ea3cdd6e1..9024ffb092 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.cc @@ -34,9 +34,9 @@ #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr++/manual_constructor.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/gethostname.h" #include "src/core/lib/iomgr/resolve_address.h" diff --git a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc index 93a1fe87a2..5aa7e6cc7e 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc @@ -29,9 +29,9 @@ #include "src/core/ext/filters/client_channel/resolver_registry.h" #include "src/core/lib/backoff/backoff.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr++/manual_constructor.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/timer.h" diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index fe4fcbbb7d..3edefaae64 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -37,8 +37,8 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/debug/stats.h" -#include "src/core/lib/gpr++/debug_location.h" -#include "src/core/lib/gpr++/manual_constructor.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/profiling/timers.h" diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index f2a5c1e273..b7593ec911 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -21,9 +21,9 @@ #include "src/core/ext/filters/client_channel/connector.h" #include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gpr++/ref_counted.h" -#include "src/core/lib/gpr++/ref_counted_ptr.h" #include "src/core/lib/gpr/arena.h" +#include "src/core/lib/gprpp/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/metadata.h" diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h index 7e83ea05cd..2ee1345260 100644 --- a/src/core/ext/transport/chttp2/transport/flow_control.h +++ b/src/core/ext/transport/chttp2/transport/flow_control.h @@ -24,8 +24,8 @@ #include <grpc/support/useful.h> #include "src/core/ext/transport/chttp2/transport/http2_settings.h" -#include "src/core/lib/gpr++/abstract.h" -#include "src/core/lib/gpr++/manual_constructor.h" +#include "src/core/lib/gprpp/abstract.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/transport/bdp_estimator.h" #include "src/core/lib/transport/pid_controller.h" diff --git a/src/core/ext/transport/chttp2/transport/internal.h b/src/core/ext/transport/chttp2/transport/internal.h index de901f0ce8..6b6c0b28e2 100644 --- a/src/core/ext/transport/chttp2/transport/internal.h +++ b/src/core/ext/transport/chttp2/transport/internal.h @@ -35,7 +35,7 @@ #include "src/core/ext/transport/chttp2/transport/incoming_metadata.h" #include "src/core/ext/transport/chttp2/transport/stream_map.h" #include "src/core/lib/compression/stream_compression.h" -#include "src/core/lib/gpr++/manual_constructor.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/timer.h" diff --git a/src/core/lib/gpr++/README.md b/src/core/lib/gprpp/README.md index eab018bb31..eab018bb31 100644 --- a/src/core/lib/gpr++/README.md +++ b/src/core/lib/gprpp/README.md diff --git a/src/core/lib/gpr++/abstract.h b/src/core/lib/gprpp/abstract.h index 51d7572302..cc96edc49b 100644 --- a/src/core/lib/gpr++/abstract.h +++ b/src/core/lib/gprpp/abstract.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_ABSTRACT_H -#define GRPC_CORE_LIB_GPRXX_ABSTRACT_H +#ifndef GRPC_CORE_LIB_GPRPP_ABSTRACT_H +#define GRPC_CORE_LIB_GPRPP_ABSTRACT_H // This is needed to support abstract base classes in the c core. Since gRPC // doesn't have a c++ runtime, it will hit a linker error on delete unless @@ -31,4 +31,4 @@ #define GRPC_ABSTRACT \ { GPR_ASSERT(false); } -#endif /* GRPC_CORE_LIB_GPRXX_ABSTRACT_H */ +#endif /* GRPC_CORE_LIB_GPRPP_ABSTRACT_H */ diff --git a/src/core/lib/gpr++/atomic.h b/src/core/lib/gprpp/atomic.h index d68ccea864..8b08fc4e9c 100644 --- a/src/core/lib/gpr++/atomic.h +++ b/src/core/lib/gprpp/atomic.h @@ -16,15 +16,15 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_ATOMIC_H -#define GRPC_CORE_LIB_GPRXX_ATOMIC_H +#ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_H +#define GRPC_CORE_LIB_GPRPP_ATOMIC_H #include <grpc/support/port_platform.h> #ifdef GPR_HAS_CXX11_ATOMIC -#include "src/core/lib/gpr++/atomic_with_std.h" +#include "src/core/lib/gprpp/atomic_with_std.h" #else -#include "src/core/lib/gpr++/atomic_with_atm.h" +#include "src/core/lib/gprpp/atomic_with_atm.h" #endif -#endif /* GRPC_CORE_LIB_GPRXX_ATOMIC_H */ +#endif /* GRPC_CORE_LIB_GPRPP_ATOMIC_H */ diff --git a/src/core/lib/gpr++/atomic_with_atm.h b/src/core/lib/gprpp/atomic_with_atm.h index 09490e8148..6abf0bc38d 100644 --- a/src/core/lib/gpr++/atomic_with_atm.h +++ b/src/core/lib/gprpp/atomic_with_atm.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_ATM_H -#define GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_ATM_H +#ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_ATM_H +#define GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_ATM_H #include <grpc/support/atm.h> @@ -52,4 +52,4 @@ class atomic<bool> { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_ATM_H */ +#endif /* GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_ATM_H */ diff --git a/src/core/lib/gpr++/atomic_with_std.h b/src/core/lib/gprpp/atomic_with_std.h index b6ff90655e..83322b81c1 100644 --- a/src/core/lib/gpr++/atomic_with_std.h +++ b/src/core/lib/gprpp/atomic_with_std.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_STD_H -#define GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_STD_H +#ifndef GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_STD_H +#define GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_STD_H #include <atomic> @@ -30,4 +30,4 @@ typedef std::memory_order memory_order; } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_ATOMIC_WITH_STD_H */ +#endif /* GRPC_CORE_LIB_GPRPP_ATOMIC_WITH_STD_H */ diff --git a/src/core/lib/gpr++/debug_location.h b/src/core/lib/gprpp/debug_location.h index 5a8665ce19..287761beaf 100644 --- a/src/core/lib/gpr++/debug_location.h +++ b/src/core/lib/gprpp/debug_location.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_DEBUG_LOCATION_H -#define GRPC_CORE_LIB_GPRXX_DEBUG_LOCATION_H +#ifndef GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H +#define GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H namespace grpc_core { @@ -49,4 +49,4 @@ class DebugLocation { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_DEBUG_LOCATION_H */ +#endif /* GRPC_CORE_LIB_GPRPP_DEBUG_LOCATION_H */ diff --git a/src/core/lib/gpr++/inlined_vector.h b/src/core/lib/gprpp/inlined_vector.h index 17ee9e16bb..b78f85b893 100644 --- a/src/core/lib/gpr++/inlined_vector.h +++ b/src/core/lib/gprpp/inlined_vector.h @@ -16,12 +16,12 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_INLINED_VECTOR_H -#define GRPC_CORE_LIB_GPRXX_INLINED_VECTOR_H +#ifndef GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H +#define GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H #include <cassert> -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" namespace grpc_core { @@ -109,4 +109,4 @@ class InlinedVector { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_INLINED_VECTOR_H */ +#endif /* GRPC_CORE_LIB_GPRPP_INLINED_VECTOR_H */ diff --git a/src/core/lib/gpr++/manual_constructor.h b/src/core/lib/gprpp/manual_constructor.h index a3f006da34..cee38abc1b 100644 --- a/src/core/lib/gpr++/manual_constructor.h +++ b/src/core/lib/gprpp/manual_constructor.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_MANUAL_CONSTRUCTOR_H -#define GRPC_CORE_LIB_GPRXX_MANUAL_CONSTRUCTOR_H +#ifndef GRPC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H +#define GRPC_CORE_LIB_GPRPP_MANUAL_CONSTRUCTOR_H // manually construct a region of memory with some type diff --git a/src/core/lib/gpr++/memory.h b/src/core/lib/gprpp/memory.h index 75ed3d6cea..17f42f5983 100644 --- a/src/core/lib/gpr++/memory.h +++ b/src/core/lib/gprpp/memory.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_MEMORY_H -#define GRPC_CORE_LIB_GPRXX_MEMORY_H +#ifndef GRPC_CORE_LIB_GPRPP_MEMORY_H +#define GRPC_CORE_LIB_GPRPP_MEMORY_H #include <grpc/support/alloc.h> @@ -97,4 +97,4 @@ class Allocator { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_MEMORY_H */ +#endif /* GRPC_CORE_LIB_GPRPP_MEMORY_H */ diff --git a/src/core/lib/gpr++/orphanable.h b/src/core/lib/gprpp/orphanable.h index f106e74dde..50199730c9 100644 --- a/src/core/lib/gpr++/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -16,8 +16,8 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_ORPHANABLE_H -#define GRPC_CORE_LIB_GPRXX_ORPHANABLE_H +#ifndef GRPC_CORE_LIB_GPRPP_ORPHANABLE_H +#define GRPC_CORE_LIB_GPRPP_ORPHANABLE_H #include <grpc/support/log.h> #include <grpc/support/sync.h> @@ -25,9 +25,9 @@ #include <memory> #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gpr++/abstract.h" -#include "src/core/lib/gpr++/debug_location.h" -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/abstract.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/memory.h" namespace grpc_core { @@ -168,4 +168,4 @@ class InternallyRefCountedWithTracing : public Orphanable { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_ORPHANABLE_H */ +#endif /* GRPC_CORE_LIB_GPRPP_ORPHANABLE_H */ diff --git a/src/core/lib/gpr++/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index c2ae76c0ae..c68118a71a 100644 --- a/src/core/lib/gpr++/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -16,16 +16,16 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_REF_COUNTED_H -#define GRPC_CORE_LIB_GPRXX_REF_COUNTED_H +#ifndef GRPC_CORE_LIB_GPRPP_REF_COUNTED_H +#define GRPC_CORE_LIB_GPRPP_REF_COUNTED_H #include <grpc/support/log.h> #include <grpc/support/sync.h> #include "src/core/lib/debug/trace.h" -#include "src/core/lib/gpr++/abstract.h" -#include "src/core/lib/gpr++/debug_location.h" -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/abstract.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/memory.h" namespace grpc_core { @@ -130,4 +130,4 @@ class RefCountedWithTracing { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_REF_COUNTED_H */ +#endif /* GRPC_CORE_LIB_GPRPP_REF_COUNTED_H */ diff --git a/src/core/lib/gpr++/ref_counted_ptr.h b/src/core/lib/gprpp/ref_counted_ptr.h index 862294d1aa..dda0f00d79 100644 --- a/src/core/lib/gpr++/ref_counted_ptr.h +++ b/src/core/lib/gprpp/ref_counted_ptr.h @@ -16,12 +16,12 @@ * */ -#ifndef GRPC_CORE_LIB_GPRXX_REF_COUNTED_PTR_H -#define GRPC_CORE_LIB_GPRXX_REF_COUNTED_PTR_H +#ifndef GRPC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H +#define GRPC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H #include <utility> -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" namespace grpc_core { @@ -96,4 +96,4 @@ inline RefCountedPtr<T> MakeRefCounted(Args&&... args) { } // namespace grpc_core -#endif /* GRPC_CORE_LIB_GPRXX_REF_COUNTED_PTR_H */ +#endif /* GRPC_CORE_LIB_GPRPP_REF_COUNTED_PTR_H */ diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index 1cb0150f45..42d7cdd348 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -43,8 +43,8 @@ #include <grpc/support/useful.h> #include "src/core/lib/debug/stats.h" -#include "src/core/lib/gpr++/manual_constructor.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index b81c00ca7a..416e8384b4 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -41,8 +41,8 @@ #include <grpc/support/useful.h> #include "src/core/lib/debug/stats.h" -#include "src/core/lib/gpr++/manual_constructor.h" #include "src/core/lib/gpr/spinlock.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/iomgr_internal.h" #include "src/core/lib/iomgr/is_epollexclusive_available.h" diff --git a/src/core/lib/iomgr/ev_epollsig_linux.cc b/src/core/lib/iomgr/ev_epollsig_linux.cc index 11c64d080c..1518348992 100644 --- a/src/core/lib/iomgr/ev_epollsig_linux.cc +++ b/src/core/lib/iomgr/ev_epollsig_linux.cc @@ -43,7 +43,7 @@ #include <grpc/support/useful.h> #include "src/core/lib/debug/stats.h" -#include "src/core/lib/gpr++/manual_constructor.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/iomgr/block_annotate.h" #include "src/core/lib/iomgr/ev_posix.h" #include "src/core/lib/iomgr/iomgr_internal.h" diff --git a/src/core/lib/surface/lame_client.cc b/src/core/lib/surface/lame_client.cc index 27a2a4eeb6..a1f1cf1107 100644 --- a/src/core/lib/surface/lame_client.cc +++ b/src/core/lib/surface/lame_client.cc @@ -23,7 +23,7 @@ #include <grpc/support/alloc.h> #include <grpc/support/log.h> -#include "src/core/lib/gpr++/atomic.h" +#include "src/core/lib/gprpp/atomic.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/gpr/string.h" diff --git a/test/core/gpr++/BUILD b/test/core/gprpp/BUILD index 93324a378b..1c11e0bdb5 100644 --- a/test/core/gpr++/BUILD +++ b/test/core/gprpp/BUILD @@ -16,7 +16,7 @@ load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_c licenses(["notice"]) # Apache v2 -grpc_package(name = "test/core/gpr++") +grpc_package(name = "test/core/gprpp") grpc_cc_test( name = "manual_constructor_test", @@ -24,6 +24,7 @@ grpc_cc_test( language = "C++", deps = [ "//:gpr", + "//:gpr++_base", "//test/core/util:gpr_test_util", ], ) @@ -36,7 +37,7 @@ grpc_cc_test( ], language = "C++", deps = [ - "//:grpc", + "//:gpr++_base", "//test/core/util:gpr_test_util", ], ) @@ -49,7 +50,7 @@ grpc_cc_test( ], language = "C++", deps = [ - "//:grpc", + "//:inlined_vector", "//test/core/util:gpr_test_util", ], ) diff --git a/test/core/gpr++/inlined_vector_test.cc b/test/core/gprpp/inlined_vector_test.cc index 09d5453a56..0e712dafe4 100644 --- a/test/core/gpr++/inlined_vector_test.cc +++ b/test/core/gprpp/inlined_vector_test.cc @@ -16,9 +16,9 @@ * */ -#include "src/core/lib/gpr++/inlined_vector.h" +#include "src/core/lib/gprpp/inlined_vector.h" #include <gtest/gtest.h> -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gpr++/manual_constructor_test.cc b/test/core/gprpp/manual_constructor_test.cc index e049b793f6..f06c3cab06 100644 --- a/test/core/gpr++/manual_constructor_test.cc +++ b/test/core/gprpp/manual_constructor_test.cc @@ -18,7 +18,7 @@ /* Test of gpr synchronization support. */ -#include "src/core/lib/gpr++/manual_constructor.h" +#include "src/core/lib/gprpp/manual_constructor.h" #include <grpc/support/alloc.h> #include <grpc/support/log.h> #include <grpc/support/sync.h> @@ -26,7 +26,7 @@ #include <stdio.h> #include <stdlib.h> #include <cstring> -#include "src/core/lib/gpr++/abstract.h" +#include "src/core/lib/gprpp/abstract.h" #include "test/core/util/test_config.h" class A { diff --git a/test/core/gpr++/memory_test.cc b/test/core/gprpp/memory_test.cc index 3553e119e3..180c36fad7 100644 --- a/test/core/gpr++/memory_test.cc +++ b/test/core/gprpp/memory_test.cc @@ -16,7 +16,7 @@ * */ -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" #include <gtest/gtest.h> #include "test/core/util/test_config.h" diff --git a/test/core/gpr++/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc index 4513d25da1..ff2f6d8bc2 100644 --- a/test/core/gpr++/orphanable_test.cc +++ b/test/core/gprpp/orphanable_test.cc @@ -16,11 +16,11 @@ * */ -#include "src/core/lib/gpr++/orphanable.h" +#include "src/core/lib/gprpp/orphanable.h" #include <gtest/gtest.h> -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gpr++/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc index e897b2859c..f1f13f3183 100644 --- a/test/core/gpr++/ref_counted_ptr_test.cc +++ b/test/core/gprpp/ref_counted_ptr_test.cc @@ -16,14 +16,14 @@ * */ -#include "src/core/lib/gpr++/ref_counted_ptr.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include <gtest/gtest.h> #include <grpc/support/log.h> -#include "src/core/lib/gpr++/memory.h" -#include "src/core/lib/gpr++/ref_counted.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/ref_counted.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gpr++/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc index 568ec51c64..b1b0fee5c0 100644 --- a/test/core/gpr++/ref_counted_test.cc +++ b/test/core/gprpp/ref_counted_test.cc @@ -16,11 +16,11 @@ * */ -#include "src/core/lib/gpr++/ref_counted.h" +#include "src/core/lib/gprpp/ref_counted.h" #include <gtest/gtest.h> -#include "src/core/lib/gpr++/memory.h" +#include "src/core/lib/gprpp/memory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 55b10268ba..a6c5fb2c8e 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -950,17 +950,6 @@ src/core/lib/compression/stream_compression_identity.h \ src/core/lib/debug/stats.h \ src/core/lib/debug/stats_data.h \ src/core/lib/debug/trace.h \ -src/core/lib/gpr++/abstract.h \ -src/core/lib/gpr++/atomic.h \ -src/core/lib/gpr++/atomic_with_atm.h \ -src/core/lib/gpr++/atomic_with_std.h \ -src/core/lib/gpr++/debug_location.h \ -src/core/lib/gpr++/inlined_vector.h \ -src/core/lib/gpr++/manual_constructor.h \ -src/core/lib/gpr++/memory.h \ -src/core/lib/gpr++/orphanable.h \ -src/core/lib/gpr++/ref_counted.h \ -src/core/lib/gpr++/ref_counted_ptr.h \ src/core/lib/gpr/arena.h \ src/core/lib/gpr/env.h \ src/core/lib/gpr/fork.h \ @@ -972,6 +961,17 @@ src/core/lib/gpr/string_windows.h \ src/core/lib/gpr/thd_internal.h \ src/core/lib/gpr/time_precise.h \ src/core/lib/gpr/tmpfile.h \ +src/core/lib/gprpp/abstract.h \ +src/core/lib/gprpp/atomic.h \ +src/core/lib/gprpp/atomic_with_atm.h \ +src/core/lib/gprpp/atomic_with_std.h \ +src/core/lib/gprpp/debug_location.h \ +src/core/lib/gprpp/inlined_vector.h \ +src/core/lib/gprpp/manual_constructor.h \ +src/core/lib/gprpp/memory.h \ +src/core/lib/gprpp/orphanable.h \ +src/core/lib/gprpp/ref_counted.h \ +src/core/lib/gprpp/ref_counted_ptr.h \ src/core/lib/http/format_request.h \ src/core/lib/http/httpcli.h \ src/core/lib/http/parser.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 7857ec72fd..f3e624ba72 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1064,18 +1064,6 @@ src/core/lib/debug/stats_data.cc \ src/core/lib/debug/stats_data.h \ src/core/lib/debug/trace.cc \ src/core/lib/debug/trace.h \ -src/core/lib/gpr++/README.md \ -src/core/lib/gpr++/abstract.h \ -src/core/lib/gpr++/atomic.h \ -src/core/lib/gpr++/atomic_with_atm.h \ -src/core/lib/gpr++/atomic_with_std.h \ -src/core/lib/gpr++/debug_location.h \ -src/core/lib/gpr++/inlined_vector.h \ -src/core/lib/gpr++/manual_constructor.h \ -src/core/lib/gpr++/memory.h \ -src/core/lib/gpr++/orphanable.h \ -src/core/lib/gpr++/ref_counted.h \ -src/core/lib/gpr++/ref_counted_ptr.h \ src/core/lib/gpr/README.md \ src/core/lib/gpr/alloc.cc \ src/core/lib/gpr/arena.cc \ @@ -1130,6 +1118,18 @@ src/core/lib/gpr/tmpfile_msys.cc \ src/core/lib/gpr/tmpfile_posix.cc \ src/core/lib/gpr/tmpfile_windows.cc \ src/core/lib/gpr/wrap_memcpy.cc \ +src/core/lib/gprpp/README.md \ +src/core/lib/gprpp/abstract.h \ +src/core/lib/gprpp/atomic.h \ +src/core/lib/gprpp/atomic_with_atm.h \ +src/core/lib/gprpp/atomic_with_std.h \ +src/core/lib/gprpp/debug_location.h \ +src/core/lib/gprpp/inlined_vector.h \ +src/core/lib/gprpp/manual_constructor.h \ +src/core/lib/gprpp/memory.h \ +src/core/lib/gprpp/orphanable.h \ +src/core/lib/gprpp/ref_counted.h \ +src/core/lib/gprpp/ref_counted_ptr.h \ src/core/lib/http/format_request.cc \ src/core/lib/http/format_request.h \ src/core/lib/http/httpcli.cc \ diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 982d9ef649..362effd7d2 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -687,7 +687,7 @@ "language": "c", "name": "gpr_manual_constructor_test", "src": [ - "test/core/gpr++/manual_constructor_test.cc" + "test/core/gprpp/manual_constructor_test.cc" ], "third_party": false, "type": "target" @@ -3542,7 +3542,7 @@ "language": "c++", "name": "inlined_vector_test", "src": [ - "test/core/gpr++/inlined_vector_test.cc" + "test/core/gprpp/inlined_vector_test.cc" ], "third_party": false, "type": "target" @@ -3662,7 +3662,7 @@ "language": "c++", "name": "memory_test", "src": [ - "test/core/gpr++/memory_test.cc" + "test/core/gprpp/memory_test.cc" ], "third_party": false, "type": "target" @@ -3740,7 +3740,7 @@ "language": "c++", "name": "orphanable_test", "src": [ - "test/core/gpr++/orphanable_test.cc" + "test/core/gprpp/orphanable_test.cc" ], "third_party": false, "type": "target" @@ -3951,7 +3951,7 @@ "language": "c++", "name": "ref_counted_ptr_test", "src": [ - "test/core/gpr++/ref_counted_ptr_test.cc" + "test/core/gprpp/ref_counted_ptr_test.cc" ], "third_party": false, "type": "target" @@ -3970,7 +3970,7 @@ "language": "c++", "name": "ref_counted_test", "src": [ - "test/core/gpr++/ref_counted_test.cc" + "test/core/gprpp/ref_counted_test.cc" ], "third_party": false, "type": "target" @@ -7906,12 +7906,6 @@ "include/grpc/support/tls_msvc.h", "include/grpc/support/tls_pthread.h", "include/grpc/support/useful.h", - "src/core/lib/gpr++/abstract.h", - "src/core/lib/gpr++/atomic.h", - "src/core/lib/gpr++/atomic_with_atm.h", - "src/core/lib/gpr++/atomic_with_std.h", - "src/core/lib/gpr++/manual_constructor.h", - "src/core/lib/gpr++/memory.h", "src/core/lib/gpr/arena.h", "src/core/lib/gpr/env.h", "src/core/lib/gpr/fork.h", @@ -7923,6 +7917,12 @@ "src/core/lib/gpr/thd_internal.h", "src/core/lib/gpr/time_precise.h", "src/core/lib/gpr/tmpfile.h", + "src/core/lib/gprpp/abstract.h", + "src/core/lib/gprpp/atomic.h", + "src/core/lib/gprpp/atomic_with_atm.h", + "src/core/lib/gprpp/atomic_with_std.h", + "src/core/lib/gprpp/manual_constructor.h", + "src/core/lib/gprpp/memory.h", "src/core/lib/profiling/timers.h" ], "is_filegroup": true, @@ -7955,12 +7955,6 @@ "include/grpc/support/tls_msvc.h", "include/grpc/support/tls_pthread.h", "include/grpc/support/useful.h", - "src/core/lib/gpr++/abstract.h", - "src/core/lib/gpr++/atomic.h", - "src/core/lib/gpr++/atomic_with_atm.h", - "src/core/lib/gpr++/atomic_with_std.h", - "src/core/lib/gpr++/manual_constructor.h", - "src/core/lib/gpr++/memory.h", "src/core/lib/gpr/arena.h", "src/core/lib/gpr/env.h", "src/core/lib/gpr/fork.h", @@ -7972,6 +7966,12 @@ "src/core/lib/gpr/thd_internal.h", "src/core/lib/gpr/time_precise.h", "src/core/lib/gpr/tmpfile.h", + "src/core/lib/gprpp/abstract.h", + "src/core/lib/gprpp/atomic.h", + "src/core/lib/gprpp/atomic_with_atm.h", + "src/core/lib/gprpp/atomic_with_std.h", + "src/core/lib/gprpp/manual_constructor.h", + "src/core/lib/gprpp/memory.h", "src/core/lib/profiling/timers.h" ], "third_party": false, @@ -8229,11 +8229,11 @@ "src/core/lib/compression/stream_compression_identity.h", "src/core/lib/debug/stats.h", "src/core/lib/debug/stats_data.h", - "src/core/lib/gpr++/debug_location.h", - "src/core/lib/gpr++/inlined_vector.h", - "src/core/lib/gpr++/orphanable.h", - "src/core/lib/gpr++/ref_counted.h", - "src/core/lib/gpr++/ref_counted_ptr.h", + "src/core/lib/gprpp/debug_location.h", + "src/core/lib/gprpp/inlined_vector.h", + "src/core/lib/gprpp/orphanable.h", + "src/core/lib/gprpp/ref_counted.h", + "src/core/lib/gprpp/ref_counted_ptr.h", "src/core/lib/http/format_request.h", "src/core/lib/http/httpcli.h", "src/core/lib/http/parser.h", @@ -8370,11 +8370,11 @@ "src/core/lib/compression/stream_compression_identity.h", "src/core/lib/debug/stats.h", "src/core/lib/debug/stats_data.h", - "src/core/lib/gpr++/debug_location.h", - "src/core/lib/gpr++/inlined_vector.h", - "src/core/lib/gpr++/orphanable.h", - "src/core/lib/gpr++/ref_counted.h", - "src/core/lib/gpr++/ref_counted_ptr.h", + "src/core/lib/gprpp/debug_location.h", + "src/core/lib/gprpp/inlined_vector.h", + "src/core/lib/gprpp/orphanable.h", + "src/core/lib/gprpp/ref_counted.h", + "src/core/lib/gprpp/ref_counted_ptr.h", "src/core/lib/http/format_request.h", "src/core/lib/http/httpcli.h", "src/core/lib/http/parser.h", |