From d9e94692ed2bcfad531c4aa91e88907f1e137b69 Mon Sep 17 00:00:00 2001 From: lqx <lqxlucky@qq.com> Date: Sat, 14 Sep 2024 22:35:01 +0800 Subject: [PATCH] Fixed a compilation error where macro definitions could not be found --- src/kiwi.cc | 7 +------ src/kiwi.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/kiwi.cc b/src/kiwi.cc index b9f6353f..a73187aa 100644 --- a/src/kiwi.cc +++ b/src/kiwi.cc @@ -106,13 +106,8 @@ bool KiwiDB::ParseArgs(int argc, char* argv[]) { std::cerr << "kiwi Server version: " << Kkiwi_VERSION << " bits=" << (sizeof(void*) == 8 ? 64 : 32) << std::endl; std::cerr << "kiwi Server Build Type: " << Kkiwi_BUILD_TYPE << std::endl; -#if defined(Kkiwi_BUILD_DATE) std::cerr << "kiwi Server Build Date: " << Kkiwi_BUILD_DATE << std::endl; -#endif -#if defined(Kkiwi_GIT_COMMIT_ID) std::cerr << "kiwi Server Build GIT SHA: " << Kkiwi_GIT_COMMIT_ID << std::endl; -#endif - std::exit(0); break; } @@ -201,7 +196,7 @@ bool KiwiDB::Init() { PREPL.SetMasterAddr(g_config.master_ip.ToString().c_str(), g_config.master_port.load()); } - event_server_ =std::make_unique<net::EventServer<std::shared_ptr<PClient>>>(num); + event_server_ = std::make_unique<net::EventServer<std::shared_ptr<PClient>>>(num); event_server_->SetRwSeparation(true); diff --git a/src/kiwi.h b/src/kiwi.h index 6921d84c..b171095a 100644 --- a/src/kiwi.h +++ b/src/kiwi.h @@ -22,6 +22,14 @@ # define Kkiwi_BUILD_TYPE "RELEASE" #endif +#ifndef Kkiwi_GIT_COMMIT_ID +# define Kkiwi_GIT_COMMIT_ID "unknown" +#endif + +#ifndef Kkiwi_BUILD_DATE +# define Kkiwi_BUILD_DATE "unknown" +#endif + namespace kiwi { class PRaft; } // namespace kiwi @@ -58,9 +66,7 @@ class KiwiDB final { event_server_->SendPacket(client, std::move(msg)); } - inline void CloseConnection(const std::shared_ptr<kiwi::PClient>& client) { - event_server_->CloseConnection(client); - } + inline void CloseConnection(const std::shared_ptr<kiwi::PClient>& client) { event_server_->CloseConnection(client); } void TCPConnect( const net::SocketAddr& addr,