Skip to content

Commit

Permalink
Merge pull request #1752 from ctiller/create-pull-request/patch-5d60f73
Browse files Browse the repository at this point in the history
Automated fix for refs/heads/scribs
  • Loading branch information
ctiller authored Jan 3, 2024
2 parents 5d60f73 + 231f48d commit 1184f28
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 7 deletions.
1 change: 1 addition & 0 deletions Package.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions build_autogenerated.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gRPC-C++.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions gRPC-Core.podspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions grpc.gemspec

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions src/core/lib/transport/stats.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef TSTATS_H
#define TSTATS_H
#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_STATS_H
#define GRPC_SRC_CORE_LIB_TRANSPORT_STATS_H

#include <grpc/support/port_platform.h>

Expand All @@ -25,4 +25,4 @@ struct grpc_transport_one_way_stats {
uint64_t header_bytes = 0;
};

#endif
#endif // GRPC_SRC_CORE_LIB_TRANSPORT_STATS_H
8 changes: 4 additions & 4 deletions test/core/end2end/tests/http2_stats.cc
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ class FakeCallTracer : public ClientCallTracer {
}

private:
static grpc_transport_stream_stats transport_stream_stats_ ABSL_GUARDED_BY(
g_mu);
static grpc_transport_stream_stats transport_stream_stats_
ABSL_GUARDED_BY(g_mu);
};

explicit FakeCallTracer() {}
Expand Down Expand Up @@ -192,8 +192,8 @@ class FakeServerCallTracer : public ServerCallTracer {
}

private:
static grpc_transport_stream_stats transport_stream_stats_ ABSL_GUARDED_BY(
g_mu);
static grpc_transport_stream_stats transport_stream_stats_
ABSL_GUARDED_BY(g_mu);
};

grpc_transport_stream_stats FakeServerCallTracer::transport_stream_stats_;
Expand Down
1 change: 1 addition & 0 deletions tools/doxygen/Doxyfile.c++.internal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions tools/doxygen/Doxyfile.core.internal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1184f28

Please sign in to comment.