From 35e3971e899313870c5006ba9a99f2740ce216f6 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:41:24 -0800
Subject: [PATCH] Make this file compile
---
test/cpp/end2end/end2end_test.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 73b7025cb3..16be518a3f 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -34,7 +34,7 @@
#include <chrono>
#include <thread>
-#include "net/grpc/cpp/echo_duplicate_proto_cc.pb.h"
+#include "test/cpp/util/echo_duplicate.pb.h"
#include "test/cpp/util/echo.pb.h"
#include "src/cpp/util/time.h"
#include <grpc++/channel_arguments.h>
@@ -47,7 +47,7 @@
#include <grpc++/server_context.h>
#include <grpc++/status.h>
#include <grpc++/stream.h>
-#include "net/util/netutil.h"
+#include "test/core/util/port.h"
#include <gtest/gtest.h>
#include <grpc/grpc.h>
@@ -141,7 +141,7 @@ class TestServiceImplDupPkg
class End2endTest : public ::testing::Test {
protected:
void SetUp() override {
- int port = PickUnusedPortOrDie();
+ int port = grpc_pick_unused_port_or_die();
server_address_ << "localhost:" << port;
// Setup server
ServerBuilder builder;
@@ -189,7 +189,7 @@ TEST_F(End2endTest, SimpleRpc) {
TEST_F(End2endTest, MultipleRpcs) {
ResetStub();
- vector<std::thread*> threads;
+ std::vector<std::thread*> threads;
for (int i = 0; i < 10; ++i) {
threads.push_back(new std::thread(SendRpc, stub_.get(), 10));
}
--
GitLab