diff options
author | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
---|---|---|
committer | ncteisen <ncteisen@gmail.com> | 2018-03-02 22:09:52 -0800 |
commit | 94dad67f4386ca1d46d96fd255cf4a9df5c087b2 (patch) | |
tree | 43e29b584e7d8c062d91eee5d0fc50639c1643e4 /tools/doxygen | |
parent | c1284576f81efc4b2d9c33c4337d8c9fbafc29de (diff) | |
parent | 6eae794c9f8f305a51274a79400124093ddc9354 (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing
Diffstat (limited to 'tools/doxygen')
-rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 2 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index c352a0a6c4..4a7428e2d8 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1032,7 +1032,6 @@ src/core/lib/gpr/murmur_hash.h \ src/core/lib/gpr/spinlock.h \ src/core/lib/gpr/string.h \ src/core/lib/gpr/string_windows.h \ -src/core/lib/gpr/thd.h \ src/core/lib/gpr/time_precise.h \ src/core/lib/gpr/tls.h \ src/core/lib/gpr/tls_gcc.h \ @@ -1051,6 +1050,7 @@ 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/gprpp/thd.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 cd235c0d77..e1856bf9aa 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1101,10 +1101,6 @@ src/core/lib/gpr/string_windows.h \ src/core/lib/gpr/sync.cc \ src/core/lib/gpr/sync_posix.cc \ src/core/lib/gpr/sync_windows.cc \ -src/core/lib/gpr/thd.cc \ -src/core/lib/gpr/thd.h \ -src/core/lib/gpr/thd_posix.cc \ -src/core/lib/gpr/thd_windows.cc \ src/core/lib/gpr/time.cc \ src/core/lib/gpr/time_posix.cc \ src/core/lib/gpr/time_precise.cc \ @@ -1133,6 +1129,9 @@ 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/gprpp/thd.h \ +src/core/lib/gprpp/thd_posix.cc \ +src/core/lib/gprpp/thd_windows.cc \ src/core/lib/http/format_request.cc \ src/core/lib/http/format_request.h \ src/core/lib/http/httpcli.cc \ |