Merge pull request #5597 from grpc/revert-5547-limit_cores_includes

Revert "Ensure that no #includes are inside of a namespace."

test/cpp/interop/reconnect_interop_client.cc

@@ -34,16 +34,16 @@
 #include <memory>
 #include <sstream>
 
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 #include <gflags/gflags.h>
 #include <grpc++/channel.h>
 #include <grpc++/client_context.h>
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
-#include "src/proto/grpc/testing/empty.grpc.pb.h"
-#include "src/proto/grpc/testing/messages.grpc.pb.h"
-#include "src/proto/grpc/testing/test.grpc.pb.h"
 #include "test/cpp/util/create_test_channel.h"
 #include "test/cpp/util/test_config.h"
+#include "src/proto/grpc/testing/test.grpc.pb.h"
+#include "src/proto/grpc/testing/empty.grpc.pb.h"
+#include "src/proto/grpc/testing/messages.grpc.pb.h"
 
 DEFINE_int32(server_control_port, 0, "Server port for control rpcs.");
 DEFINE_int32(server_retry_port, 0, "Server port for testing reconnection.");

test/cpp/interop/reconnect_interop_server.cc

@@ -31,8 +31,6 @@
  *
  */
 
-// Test description at doc/connection-backoff-interop-test-description.md
-
 #include <signal.h>
 #include <unistd.h>
 
@@ -42,17 +40,17 @@
 #include <sstream>
 
 #include <gflags/gflags.h>
+#include <grpc/grpc.h>
+#include <grpc/support/log.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
-#include <grpc/grpc.h>
-#include <grpc/support/log.h>
 
-#include "src/proto/grpc/testing/empty.grpc.pb.h"
-#include "src/proto/grpc/testing/messages.grpc.pb.h"
-#include "src/proto/grpc/testing/test.grpc.pb.h"
 #include "test/core/util/reconnect_server.h"
 #include "test/cpp/util/test_config.h"
+#include "src/proto/grpc/testing/test.grpc.pb.h"
+#include "src/proto/grpc/testing/empty.grpc.pb.h"
+#include "src/proto/grpc/testing/messages.grpc.pb.h"
 
 DEFINE_int32(control_port, 0, "Server port for controlling the server.");
 DEFINE_int32(retry_port, 0,

test/cpp/qps/limit_cores.cc

@@ -37,15 +37,14 @@
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
+namespace grpc {
+namespace testing {
+
 #ifdef GPR_CPU_LINUX
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
 #include <sched.h>
-
-namespace grpc {
-namespace testing {
-
 int LimitCores(const int* cores, int cores_size) {
   const int num_cores = gpr_cpu_num_cores();
   int cores_set = 0;