diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc index 369afc1e775..ab7d8697589 100644 --- a/src/compiler/objective_c_generator.cc +++ b/src/compiler/objective_c_generator.cc @@ -28,10 +28,10 @@ using ::google::protobuf::compiler::objectivec::ClassName; using ::grpc::protobuf::FileDescriptor; +using ::grpc::protobuf::FileDescriptor; using ::grpc::protobuf::MethodDescriptor; using ::grpc::protobuf::ServiceDescriptor; using ::grpc::protobuf::io::Printer; -using ::grpc::protobuf::FileDescriptor; using ::std::map; using ::std::set; diff --git a/src/compiler/objective_c_generator.h b/src/compiler/objective_c_generator.h index 700c9c496e9..d3aed76c4f4 100644 --- a/src/compiler/objective_c_generator.h +++ b/src/compiler/objective_c_generator.h @@ -24,8 +24,8 @@ namespace grpc_objective_c_generator { using ::grpc::protobuf::FileDescriptor; -using ::grpc::protobuf::ServiceDescriptor; using ::grpc::protobuf::FileDescriptor; +using ::grpc::protobuf::ServiceDescriptor; using ::grpc::string; // Returns forward declaration of classes in the generated header file. diff --git a/src/core/lib/support/fork.cc b/src/core/lib/support/fork.cc index 2f29af899dd..d59ca5584cb 100644 --- a/src/core/lib/support/fork.cc +++ b/src/core/lib/support/fork.cc @@ -38,9 +38,9 @@ void grpc_fork_support_init() { fork_support_enabled = 1; #else fork_support_enabled = 0; - char *env = gpr_getenv("GRPC_ENABLE_FORK_SUPPORT"); + char* env = gpr_getenv("GRPC_ENABLE_FORK_SUPPORT"); if (env != NULL) { - static const char *truthy[] = {"yes", "Yes", "YES", "true", + static const char* truthy[] = {"yes", "Yes", "YES", "true", "True", "TRUE", "1"}; for (size_t i = 0; i < GPR_ARRAY_SIZE(truthy); i++) { if (0 == strcmp(env, truthy[i])) {