Commit de3dcc2e authored by Ge Jun's avatar Ge Jun

Unify inclusion of brpc headers inside src to double quotes

parent 2ae7f04c
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
namespace brpc { namespace brpc {
// Contain the information for showing a tab. // Contain the information for showing a tab.
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#ifndef BRPC_LOG_H #ifndef BRPC_LOG_H
#define BRPC_LOG_H #define BRPC_LOG_H
#include <bthread/errno.h>
#include <inttypes.h> // PRId64 PRIu64 #include <inttypes.h> // PRId64 PRIu64
#include "bthread/errno.h"
#define RPC_VLOG_LEVEL 99 #define RPC_VLOG_LEVEL 99
#define RPC_VLOG_IS_ON VLOG_IS_ON(RPC_VLOG_LEVEL) #define RPC_VLOG_IS_ON VLOG_IS_ON(RPC_VLOG_LEVEL)
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include <stdint.h> // int64_t #include <stdint.h> // int64_t
#include <string> // std::string #include <string> // std::string
#include <brpc/controller.h> // Controller #include "brpc/controller.h" // Controller
namespace brpc { namespace brpc {
namespace policy { namespace policy {
...@@ -88,5 +87,4 @@ private: ...@@ -88,5 +87,4 @@ private:
} // namespace policy } // namespace policy
} // namespace brpc } // namespace brpc
#endif //BRPC_HULU_PBRPC_CONTROLLER_H #endif //BRPC_HULU_PBRPC_CONTROLLER_H
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define BTHREAD_COMLOG_INITIALIZER_H #define BTHREAD_COMLOG_INITIALIZER_H
#include <com_log.h> // com_openlog_r, com_closelog_r #include <com_log.h> // com_openlog_r, com_closelog_r
#include <butil/macros.h> #include "butil/macros.h"
namespace bthread { namespace bthread {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef BUTIL_LOGGING_H_ #ifndef BUTIL_LOGGING_H_
#define BUTIL_LOGGING_H_ #define BUTIL_LOGGING_H_
#include <butil/config.h> // BRPC_WITH_GLOG #include "butil/config.h" // BRPC_WITH_GLOG
#include <inttypes.h> #include <inttypes.h>
#include <string> #include <string>
......
...@@ -16,16 +16,16 @@ ...@@ -16,16 +16,16 @@
// Author: Zhu,Jiashun (zhujiashun@baidu.com) // Author: Zhu,Jiashun (zhujiashun@baidu.com)
// Date: Wed Apr 11 14:35:56 CST 2018 // Date: Wed Apr 11 14:35:56 CST 2018
#include "process_util.h"
#include <fcntl.h> // open #include <fcntl.h> // open
#include <stdio.h> // snprintf #include <stdio.h> // snprintf
#include <butil/fd_guard.h> // butil::fd_guard
#include <butil/logging.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <unistd.h> // read, gitpid #include <unistd.h> // read, gitpid
#include <sstream> // std::ostringstream #include <sstream> // std::ostringstream
#include <butil/popen.h> // read_command_output #include "butil/fd_guard.h" // butil::fd_guard
#include "butil/logging.h"
#include "butil/popen.h" // read_command_output
#include "butil/process_util.h"
namespace butil { namespace butil {
......
...@@ -20,6 +20,10 @@ ...@@ -20,6 +20,10 @@
#include <sys/resource.h> // getrusage #include <sys/resource.h> // getrusage
#include <dirent.h> // dirent #include <dirent.h> // dirent
#include <iomanip> // setw #include <iomanip> // setw
#if defined(OS_MACOSX)
#include <libproc.h>
#include <sys/resource.h>
#endif
#include "butil/time.h" #include "butil/time.h"
#include "butil/memory/singleton_on_pthread_once.h" #include "butil/memory/singleton_on_pthread_once.h"
#include "butil/scoped_lock.h" #include "butil/scoped_lock.h"
...@@ -27,12 +31,8 @@ ...@@ -27,12 +31,8 @@
#include "butil/files/dir_reader_posix.h" #include "butil/files/dir_reader_posix.h"
#include "butil/file_util.h" #include "butil/file_util.h"
#include "butil/process_util.h" // ReadCommandLine #include "butil/process_util.h" // ReadCommandLine
#include <butil/popen.h> // read_command_output #include "butil/popen.h" // read_command_output
#include "bvar/passive_status.h" #include "bvar/passive_status.h"
#if defined(OS_MACOSX)
#include <libproc.h>
#include <sys/resource.h>
#endif
namespace bvar { namespace bvar {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment