diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-09 17:46:29 -0800 |
| commit | 4e9265c828f0b559b5fdba04913fed46bf771399 (patch) | |
| tree | 4a379fc2bdc037753cf8d81f8b86327e4bc50a42 /test/cpp/common/channel_arguments_test.cc | |
| parent | 0ee7574732a06e8cace4e099a678f4bd5dbff679 (diff) | |
| parent | d9da7387b8057f3bd99a417a5ee905377bce9296 (diff) | |
Merge with master
Diffstat (limited to 'test/cpp/common/channel_arguments_test.cc')
| -rw-r--r-- | test/cpp/common/channel_arguments_test.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/cpp/common/channel_arguments_test.cc b/test/cpp/common/channel_arguments_test.cc index cfe64f11b1..d6ed2e5aa2 100644 --- a/test/cpp/common/channel_arguments_test.cc +++ b/test/cpp/common/channel_arguments_test.cc @@ -23,10 +23,8 @@ #include <grpc/support/useful.h> #include <gtest/gtest.h> -extern "C" { #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/socket_mutator.h" -} namespace grpc { namespace testing { @@ -72,7 +70,7 @@ grpc_socket_mutator_vtable test_mutator_vtable = { TestSocketMutator::TestSocketMutator() { grpc_socket_mutator_init(this, &test_mutator_vtable); } -} +} // namespace class ChannelArgumentsTest : public ::testing::Test { protected: |