Minor changes and fixes
diff --git a/BUILD b/BUILD
index 62f99f6..4fe3dc6 100644
--- a/BUILD
+++ b/BUILD
@@ -527,8 +527,6 @@
"src/core/lib/gpr/sync.cc",
"src/core/lib/gpr/sync_posix.cc",
"src/core/lib/gpr/sync_windows.cc",
- "src/core/lib/gprpp/thd_posix.cc",
- "src/core/lib/gprpp/thd_windows.cc",
"src/core/lib/gpr/time.cc",
"src/core/lib/gpr/time_posix.cc",
"src/core/lib/gpr/time_precise.cc",
@@ -538,6 +536,8 @@
"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/thd_posix.cc",
+ "src/core/lib/gprpp/thd_windows.cc",
"src/core/lib/profiling/basic_timers.cc",
"src/core/lib/profiling/stap_timers.cc",
],
@@ -551,7 +551,6 @@
"src/core/lib/gpr/spinlock.h",
"src/core/lib/gpr/string.h",
"src/core/lib/gpr/string_windows.h",
- "src/core/lib/gprpp/thd.h",
"src/core/lib/gpr/time_precise.h",
"src/core/lib/gpr/tls.h",
"src/core/lib/gpr/tls_gcc.h",
@@ -559,6 +558,10 @@
"src/core/lib/gpr/tls_pthread.h",
"src/core/lib/gpr/tmpfile.h",
"src/core/lib/gpr/useful.h",
+ "src/core/lib/gprpp/abstract.h",
+ "src/core/lib/gprpp/manual_constructor.h",
+ "src/core/lib/gprpp/memory.h",
+ "src/core/lib/gprpp/thd.h",
"src/core/lib/profiling/timers.h",
],
language = "c++",
@@ -601,16 +604,6 @@
)
grpc_cc_library(
- name = "gpr++_base",
- language = "c++",
- public_hdrs = [
- "src/core/lib/gprpp/abstract.h",
- "src/core/lib/gprpp/manual_constructor.h",
- "src/core/lib/gprpp/memory.h",
- ],
-)
-
-grpc_cc_library(
name = "atomic",
hdrs = [
"src/core/lib/gprpp/atomic_with_atm.h",
@@ -632,7 +625,7 @@
"src/core/lib/gprpp/inlined_vector.h",
],
deps = [
- "gpr++_base",
+ "gpr_base",
],
)
@@ -648,7 +641,7 @@
public_hdrs = ["src/core/lib/gprpp/orphanable.h"],
deps = [
"debug_location",
- "gpr++_base",
+ "gpr_base",
"grpc_trace",
"ref_counted_ptr",
],
@@ -660,7 +653,7 @@
public_hdrs = ["src/core/lib/gprpp/ref_counted.h"],
deps = [
"debug_location",
- "gpr++_base",
+ "gpr_base",
"grpc_trace",
"ref_counted_ptr",
],
@@ -671,7 +664,7 @@
language = "c++",
public_hdrs = ["src/core/lib/gprpp/ref_counted_ptr.h"],
deps = [
- "gpr++_base",
+ "gpr_base",
],
)
@@ -942,13 +935,12 @@
language = "c++",
public_hdrs = GRPC_PUBLIC_HDRS,
deps = [
- "gpr++_base",
"gpr_base",
"grpc_codegen",
"grpc_trace",
+ "inlined_vector",
"ref_counted",
"ref_counted_ptr",
- "inlined_vector",
],
)
@@ -1424,7 +1416,7 @@
],
language = "c++",
deps = [
- "gpr++_base",
+ "gpr_base",
"grpc_base",
"grpc_http_filters",
"grpc_transport_chttp2_alpn",