diff options
Diffstat (limited to 'src/server/proto')
26 files changed, 315 insertions, 240 deletions
diff --git a/src/server/proto/Client/account_service.pb.cc b/src/server/proto/Client/account_service.pb.cc index 85b6c4a53c2..f90546e85ec 100644 --- a/src/server/proto/Client/account_service.pb.cc +++ b/src/server/proto/Client/account_service.pb.cc @@ -10734,41 +10734,45 @@ google::protobuf::ServiceDescriptor const* AccountService::descriptor() { void AccountService::GetGameAccount(::bgs::protocol::account::v1::GameAccountHandle const* request, std::function<void(::bgs::protocol::account::v1::GameAccountBlob const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameAccount(bgs.protocol.account.v1.GameAccountHandle{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 12, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GameAccountBlob response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 12, request, std::move(callback)); } void AccountService::GetAccount(::bgs::protocol::account::v1::GetAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAccount(bgs.protocol.account.v1.GetAccountRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 13, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetAccountResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 13, request, std::move(callback)); } void AccountService::CreateGameAccount(::bgs::protocol::account::v1::CreateGameAccountRequest const* request, std::function<void(::bgs::protocol::account::v1::GameAccountHandle const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.CreateGameAccount(bgs.protocol.account.v1.CreateGameAccountRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 14, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GameAccountHandle response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 14, request, std::move(callback)); } void AccountService::IsIgrAddress(::bgs::protocol::account::v1::IsIgrAddressRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.IsIgrAddress(bgs.protocol.account.v1.IsIgrAddressRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 15, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 15, request, std::move(callback)); } void AccountService::CacheExpire(::bgs::protocol::account::v1::CacheExpireRequest const* request) { @@ -10780,111 +10784,122 @@ void AccountService::CacheExpire(::bgs::protocol::account::v1::CacheExpireReques void AccountService::CredentialUpdate(::bgs::protocol::account::v1::CredentialUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::CredentialUpdateResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.CredentialUpdate(bgs.protocol.account.v1.CredentialUpdateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 21, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::CredentialUpdateResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 21, request, std::move(callback)); } void AccountService::Subscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::account::v1::SubscriptionUpdateResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.Subscribe(bgs.protocol.account.v1.SubscriptionUpdateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 25, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::SubscriptionUpdateResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 25, request, std::move(callback)); } void AccountService::Unsubscribe(::bgs::protocol::account::v1::SubscriptionUpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.Unsubscribe(bgs.protocol.account.v1.SubscriptionUpdateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 26, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 26, request, std::move(callback)); } void AccountService::GetAccountState(::bgs::protocol::account::v1::GetAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAccountStateResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAccountState(bgs.protocol.account.v1.GetAccountStateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 30, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetAccountStateResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 30, request, std::move(callback)); } void AccountService::GetGameAccountState(::bgs::protocol::account::v1::GetGameAccountStateRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameAccountStateResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameAccountState(bgs.protocol.account.v1.GetGameAccountStateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 31, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetGameAccountStateResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 31, request, std::move(callback)); } void AccountService::GetLicenses(::bgs::protocol::account::v1::GetLicensesRequest const* request, std::function<void(::bgs::protocol::account::v1::GetLicensesResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetLicenses(bgs.protocol.account.v1.GetLicensesRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 32, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetLicensesResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 32, request, std::move(callback)); } void AccountService::GetGameTimeRemainingInfo(::bgs::protocol::account::v1::GetGameTimeRemainingInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameTimeRemainingInfoResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameTimeRemainingInfo(bgs.protocol.account.v1.GetGameTimeRemainingInfoRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 33, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetGameTimeRemainingInfoResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 33, request, std::move(callback)); } void AccountService::GetGameSessionInfo(::bgs::protocol::account::v1::GetGameSessionInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetGameSessionInfoResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetGameSessionInfo(bgs.protocol.account.v1.GetGameSessionInfoRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 34, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetGameSessionInfoResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 34, request, std::move(callback)); } void AccountService::GetCAISInfo(::bgs::protocol::account::v1::GetCAISInfoRequest const* request, std::function<void(::bgs::protocol::account::v1::GetCAISInfoResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetCAISInfo(bgs.protocol.account.v1.GetCAISInfoRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 35, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetCAISInfoResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 35, request, std::move(callback)); } void AccountService::ForwardCacheExpire(::bgs::protocol::account::v1::ForwardCacheExpireRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.ForwardCacheExpire(bgs.protocol.account.v1.ForwardCacheExpireRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 36, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 36, request, std::move(callback)); } void AccountService::GetAuthorizedData(::bgs::protocol::account::v1::GetAuthorizedDataRequest const* request, std::function<void(::bgs::protocol::account::v1::GetAuthorizedDataResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AccountService.GetAuthorizedData(bgs.protocol.account.v1.GetAuthorizedDataRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 37, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::account::v1::GetAuthorizedDataResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 37, request, std::move(callback)); } void AccountService::AccountFlagUpdate(::bgs::protocol::account::v1::AccountFlagUpdateRequest const* request) { diff --git a/src/server/proto/Client/account_types.pb.h b/src/server/proto/Client/account_types.pb.h index f1cc923d30d..7690ccaae4e 100644 --- a/src/server/proto/Client/account_types.pb.h +++ b/src/server/proto/Client/account_types.pb.h @@ -27,7 +27,7 @@ #include <google/protobuf/unknown_field_set.h> #include "entity_types.pb.h" #include "rpc_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/attribute_types.pb.h b/src/server/proto/Client/attribute_types.pb.h index 78c3e1caf0a..97f3edca6d2 100644 --- a/src/server/proto/Client/attribute_types.pb.h +++ b/src/server/proto/Client/attribute_types.pb.h @@ -26,7 +26,7 @@ #include <google/protobuf/generated_enum_reflection.h> #include <google/protobuf/unknown_field_set.h> #include "entity_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/authentication_service.pb.cc b/src/server/proto/Client/authentication_service.pb.cc index 30998e348c7..9ac0337beb9 100644 --- a/src/server/proto/Client/authentication_service.pb.cc +++ b/src/server/proto/Client/authentication_service.pb.cc @@ -7148,11 +7148,12 @@ void AuthenticationListener::OnModuleLoad(::bgs::protocol::authentication::v1::M void AuthenticationListener::OnModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationListener.OnModuleMessage(bgs.protocol.authentication.v1.ModuleMessageRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void AuthenticationListener::OnServerStateChange(::bgs::protocol::authentication::v1::ServerStateChangeRequest const* request) { @@ -7170,11 +7171,12 @@ void AuthenticationListener::OnLogonComplete(::bgs::protocol::authentication::v1 void AuthenticationListener::OnMemModuleLoad(::bgs::protocol::authentication::v1::MemModuleLoadRequest const* request, std::function<void(::bgs::protocol::authentication::v1::MemModuleLoadResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationListener.OnMemModuleLoad(bgs.protocol.authentication.v1.MemModuleLoadRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::authentication::v1::MemModuleLoadResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void AuthenticationListener::OnLogonUpdate(::bgs::protocol::authentication::v1::LogonUpdateRequest const* request) { @@ -7442,81 +7444,89 @@ google::protobuf::ServiceDescriptor const* AuthenticationService::descriptor() { void AuthenticationService::Logon(::bgs::protocol::authentication::v1::LogonRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.Logon(bgs.protocol.authentication.v1.LogonRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void AuthenticationService::ModuleNotify(::bgs::protocol::authentication::v1::ModuleNotification const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.ModuleNotify(bgs.protocol.authentication.v1.ModuleNotification{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void AuthenticationService::ModuleMessage(::bgs::protocol::authentication::v1::ModuleMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.ModuleMessage(bgs.protocol.authentication.v1.ModuleMessageRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void AuthenticationService::SelectGameAccount_DEPRECATED(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.SelectGameAccount_DEPRECATED(bgs.protocol.EntityId{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 4, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 4, request, std::move(callback)); } void AuthenticationService::GenerateSSOToken(::bgs::protocol::authentication::v1::GenerateSSOTokenRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateSSOTokenResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.GenerateSSOToken(bgs.protocol.authentication.v1.GenerateSSOTokenRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 5, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::authentication::v1::GenerateSSOTokenResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 5, request, std::move(callback)); } void AuthenticationService::SelectGameAccount(::bgs::protocol::authentication::v1::SelectGameAccountRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.SelectGameAccount(bgs.protocol.authentication.v1.SelectGameAccountRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void AuthenticationService::VerifyWebCredentials(::bgs::protocol::authentication::v1::VerifyWebCredentialsRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.VerifyWebCredentials(bgs.protocol.authentication.v1.VerifyWebCredentialsRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 7, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 7, request, std::move(callback)); } void AuthenticationService::GenerateWebCredentials(::bgs::protocol::authentication::v1::GenerateWebCredentialsRequest const* request, std::function<void(::bgs::protocol::authentication::v1::GenerateWebCredentialsResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method AuthenticationService.GenerateWebCredentials(bgs.protocol.authentication.v1.GenerateWebCredentialsRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 8, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::authentication::v1::GenerateWebCredentialsResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 8, request, std::move(callback)); } void AuthenticationService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/challenge_service.pb.cc b/src/server/proto/Client/challenge_service.pb.cc index c42f5e4f967..cb58fc55fa2 100644 --- a/src/server/proto/Client/challenge_service.pb.cc +++ b/src/server/proto/Client/challenge_service.pb.cc @@ -4469,41 +4469,45 @@ google::protobuf::ServiceDescriptor const* ChallengeService::descriptor() { void ChallengeService::ChallengePicked(::bgs::protocol::challenge::v1::ChallengePickedRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengePickedResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengePicked(bgs.protocol.challenge.v1.ChallengePickedRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::challenge::v1::ChallengePickedResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void ChallengeService::ChallengeAnswered(::bgs::protocol::challenge::v1::ChallengeAnsweredRequest const* request, std::function<void(::bgs::protocol::challenge::v1::ChallengeAnsweredResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengeAnswered(bgs.protocol.challenge.v1.ChallengeAnsweredRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::challenge::v1::ChallengeAnsweredResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void ChallengeService::ChallengeCancelled(::bgs::protocol::challenge::v1::ChallengeCancelledRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.ChallengeCancelled(bgs.protocol.challenge.v1.ChallengeCancelledRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void ChallengeService::SendChallengeToUser(::bgs::protocol::challenge::v1::SendChallengeToUserRequest const* request, std::function<void(::bgs::protocol::challenge::v1::SendChallengeToUserResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChallengeService.SendChallengeToUser(bgs.protocol.challenge.v1.SendChallengeToUserRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 4, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::challenge::v1::SendChallengeToUserResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 4, request, std::move(callback)); } void ChallengeService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/channel_service.pb.cc b/src/server/proto/Client/channel_service.pb.cc index 3c2b099d938..2bbbe0d0d11 100644 --- a/src/server/proto/Client/channel_service.pb.cc +++ b/src/server/proto/Client/channel_service.pb.cc @@ -5993,81 +5993,89 @@ google::protobuf::ServiceDescriptor const* ChannelService::descriptor() { void ChannelService::AddMember(::bgs::protocol::channel::v1::AddMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.AddMember(bgs.protocol.channel.v1.AddMemberRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void ChannelService::RemoveMember(::bgs::protocol::channel::v1::RemoveMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.RemoveMember(bgs.protocol.channel.v1.RemoveMemberRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void ChannelService::SendMessage(::bgs::protocol::channel::v1::SendMessageRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.SendMessage(bgs.protocol.channel.v1.SendMessageRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void ChannelService::UpdateChannelState(::bgs::protocol::channel::v1::UpdateChannelStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UpdateChannelState(bgs.protocol.channel.v1.UpdateChannelStateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 4, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 4, request, std::move(callback)); } void ChannelService::UpdateMemberState(::bgs::protocol::channel::v1::UpdateMemberStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UpdateMemberState(bgs.protocol.channel.v1.UpdateMemberStateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 5, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 5, request, std::move(callback)); } void ChannelService::Dissolve(::bgs::protocol::channel::v1::DissolveRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.Dissolve(bgs.protocol.channel.v1.DissolveRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void ChannelService::SetRoles(::bgs::protocol::channel::v1::SetRolesRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.SetRoles(bgs.protocol.channel.v1.SetRolesRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 7, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 7, request, std::move(callback)); } void ChannelService::UnsubscribeMember(::bgs::protocol::channel::v1::UnsubscribeMemberRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ChannelService.UnsubscribeMember(bgs.protocol.channel.v1.UnsubscribeMemberRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 8, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 8, request, std::move(callback)); } void ChannelService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/channel_types.pb.h b/src/server/proto/Client/channel_types.pb.h index a9651e0955b..af76cf5ac78 100644 --- a/src/server/proto/Client/channel_types.pb.h +++ b/src/server/proto/Client/channel_types.pb.h @@ -29,7 +29,7 @@ #include "entity_types.pb.h" #include "invitation_types.pb.h" #include "rpc_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/connection_service.pb.cc b/src/server/proto/Client/connection_service.pb.cc index 97a3d5275bc..bfd2bfe151e 100644 --- a/src/server/proto/Client/connection_service.pb.cc +++ b/src/server/proto/Client/connection_service.pb.cc @@ -3642,31 +3642,34 @@ google::protobuf::ServiceDescriptor const* ConnectionService::descriptor() { void ConnectionService::Connect(::bgs::protocol::connection::v1::ConnectRequest const* request, std::function<void(::bgs::protocol::connection::v1::ConnectResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Connect(bgs.protocol.connection.v1.ConnectRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::connection::v1::ConnectResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void ConnectionService::Bind(::bgs::protocol::connection::v1::BindRequest const* request, std::function<void(::bgs::protocol::connection::v1::BindResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Bind(bgs.protocol.connection.v1.BindRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::connection::v1::BindResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void ConnectionService::Echo(::bgs::protocol::connection::v1::EchoRequest const* request, std::function<void(::bgs::protocol::connection::v1::EchoResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Echo(bgs.protocol.connection.v1.EchoRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::connection::v1::EchoResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void ConnectionService::ForceDisconnect(::bgs::protocol::connection::v1::DisconnectNotification const* request) { @@ -3684,11 +3687,12 @@ void ConnectionService::KeepAlive(::bgs::protocol::NoData const* request) { void ConnectionService::Encrypt(::bgs::protocol::connection::v1::EncryptRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ConnectionService.Encrypt(bgs.protocol.connection.v1.EncryptRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void ConnectionService::RequestDisconnect(::bgs::protocol::connection::v1::DisconnectRequest const* request) { diff --git a/src/server/proto/Client/content_handle_types.pb.h b/src/server/proto/Client/content_handle_types.pb.h index d2f69e1329f..9e27ed1a2ba 100644 --- a/src/server/proto/Client/content_handle_types.pb.h +++ b/src/server/proto/Client/content_handle_types.pb.h @@ -24,7 +24,7 @@ #include <google/protobuf/repeated_field.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/entity_types.pb.h b/src/server/proto/Client/entity_types.pb.h index 1b01f75a9dc..c7186997651 100644 --- a/src/server/proto/Client/entity_types.pb.h +++ b/src/server/proto/Client/entity_types.pb.h @@ -25,7 +25,7 @@ #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> #include "global_extensions/field_options.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/friends_service.pb.cc b/src/server/proto/Client/friends_service.pb.cc index 73e19f22339..0da6ba192a8 100644 --- a/src/server/proto/Client/friends_service.pb.cc +++ b/src/server/proto/Client/friends_service.pb.cc @@ -4451,121 +4451,133 @@ google::protobuf::ServiceDescriptor const* FriendsService::descriptor() { void FriendsService::Subscribe(::bgs::protocol::friends::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::friends::v1::SubscribeResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.Subscribe(bgs.protocol.friends.v1.SubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::friends::v1::SubscribeResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void FriendsService::SendInvitation(::bgs::protocol::SendInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.SendInvitation(bgs.protocol.SendInvitationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void FriendsService::AcceptInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.AcceptInvitation(bgs.protocol.GenericInvitationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void FriendsService::RevokeInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RevokeInvitation(bgs.protocol.GenericInvitationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 4, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 4, request, std::move(callback)); } void FriendsService::DeclineInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.DeclineInvitation(bgs.protocol.GenericInvitationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 5, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 5, request, std::move(callback)); } void FriendsService::IgnoreInvitation(::bgs::protocol::GenericInvitationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.IgnoreInvitation(bgs.protocol.GenericInvitationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void FriendsService::AssignRole(::bgs::protocol::friends::v1::AssignRoleRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.AssignRole(bgs.protocol.friends.v1.AssignRoleRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 7, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 7, request, std::move(callback)); } void FriendsService::RemoveFriend(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::friends::v1::GenericFriendResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RemoveFriend(bgs.protocol.friends.v1.GenericFriendRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 8, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::friends::v1::GenericFriendResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 8, request, std::move(callback)); } void FriendsService::ViewFriends(::bgs::protocol::friends::v1::ViewFriendsRequest const* request, std::function<void(::bgs::protocol::friends::v1::ViewFriendsResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.ViewFriends(bgs.protocol.friends.v1.ViewFriendsRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 9, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::friends::v1::ViewFriendsResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 9, request, std::move(callback)); } void FriendsService::UpdateFriendState(::bgs::protocol::friends::v1::UpdateFriendStateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.UpdateFriendState(bgs.protocol.friends.v1.UpdateFriendStateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 10, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 10, request, std::move(callback)); } void FriendsService::Unsubscribe(::bgs::protocol::friends::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.Unsubscribe(bgs.protocol.friends.v1.UnsubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 11, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 11, request, std::move(callback)); } void FriendsService::RevokeAllInvitations(::bgs::protocol::friends::v1::GenericFriendRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method FriendsService.RevokeAllInvitations(bgs.protocol.friends.v1.GenericFriendRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 12, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 12, request, std::move(callback)); } void FriendsService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/friends_types.pb.h b/src/server/proto/Client/friends_types.pb.h index 644d0a5b8db..fee0e5cb33b 100644 --- a/src/server/proto/Client/friends_types.pb.h +++ b/src/server/proto/Client/friends_types.pb.h @@ -27,7 +27,7 @@ #include "attribute_types.pb.h" #include "entity_types.pb.h" #include "invitation_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/game_utilities_service.pb.cc b/src/server/proto/Client/game_utilities_service.pb.cc index 13188964cb4..fdb28b35fbb 100644 --- a/src/server/proto/Client/game_utilities_service.pb.cc +++ b/src/server/proto/Client/game_utilities_service.pb.cc @@ -4253,41 +4253,45 @@ google::protobuf::ServiceDescriptor const* GameUtilitiesService::descriptor() { void GameUtilitiesService::ProcessClientRequest(::bgs::protocol::game_utilities::v1::ClientRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ClientResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.ProcessClientRequest(bgs.protocol.game_utilities.v1.ClientRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::game_utilities::v1::ClientResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void GameUtilitiesService::PresenceChannelCreated(::bgs::protocol::game_utilities::v1::PresenceChannelCreatedRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.PresenceChannelCreated(bgs.protocol.game_utilities.v1.PresenceChannelCreatedRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void GameUtilitiesService::GetPlayerVariables(::bgs::protocol::game_utilities::v1::GetPlayerVariablesRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetPlayerVariables(bgs.protocol.game_utilities.v1.GetPlayerVariablesRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::game_utilities::v1::GetPlayerVariablesResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void GameUtilitiesService::ProcessServerRequest(::bgs::protocol::game_utilities::v1::ServerRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::ServerResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.ProcessServerRequest(bgs.protocol.game_utilities.v1.ServerRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 6, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::game_utilities::v1::ServerResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 6, request, std::move(callback)); } void GameUtilitiesService::OnGameAccountOnline(::bgs::protocol::game_utilities::v1::GameAccountOnlineNotification const* request) { @@ -4305,21 +4309,23 @@ void GameUtilitiesService::OnGameAccountOffline(::bgs::protocol::game_utilities: void GameUtilitiesService::GetAchievementsFile(::bgs::protocol::game_utilities::v1::GetAchievementsFileRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetAchievementsFile(bgs.protocol.game_utilities.v1.GetAchievementsFileRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 9, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::game_utilities::v1::GetAchievementsFileResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 9, request, std::move(callback)); } void GameUtilitiesService::GetAllValuesForAttribute(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeRequest const* request, std::function<void(::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method GameUtilitiesService.GetAllValuesForAttribute(bgs.protocol.game_utilities.v1.GetAllValuesForAttributeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 10, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::game_utilities::v1::GetAllValuesForAttributeResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 10, request, std::move(callback)); } void GameUtilitiesService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/game_utilities_types.pb.h b/src/server/proto/Client/game_utilities_types.pb.h index dc9a1eb4060..e8ef470549a 100644 --- a/src/server/proto/Client/game_utilities_types.pb.h +++ b/src/server/proto/Client/game_utilities_types.pb.h @@ -26,7 +26,7 @@ #include <google/protobuf/unknown_field_set.h> #include "attribute_types.pb.h" #include "entity_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/invitation_types.pb.h b/src/server/proto/Client/invitation_types.pb.h index 394e2ffd17f..476d00b5977 100644 --- a/src/server/proto/Client/invitation_types.pb.h +++ b/src/server/proto/Client/invitation_types.pb.h @@ -25,7 +25,7 @@ #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> #include "entity_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/notification_types.pb.h b/src/server/proto/Client/notification_types.pb.h index e0cf8d6c157..e44180a98d1 100644 --- a/src/server/proto/Client/notification_types.pb.h +++ b/src/server/proto/Client/notification_types.pb.h @@ -28,7 +28,7 @@ #include "attribute_types.pb.h" #include "entity_types.pb.h" #include "rpc_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/presence_service.pb.cc b/src/server/proto/Client/presence_service.pb.cc index 3d2cc3f8437..250e1a20a62 100644 --- a/src/server/proto/Client/presence_service.pb.cc +++ b/src/server/proto/Client/presence_service.pb.cc @@ -2430,61 +2430,67 @@ google::protobuf::ServiceDescriptor const* PresenceService::descriptor() { void PresenceService::Subscribe(::bgs::protocol::presence::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Subscribe(bgs.protocol.presence.v1.SubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void PresenceService::Unsubscribe(::bgs::protocol::presence::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Unsubscribe(bgs.protocol.presence.v1.UnsubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 2, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 2, request, std::move(callback)); } void PresenceService::Update(::bgs::protocol::presence::v1::UpdateRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Update(bgs.protocol.presence.v1.UpdateRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 3, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 3, request, std::move(callback)); } void PresenceService::Query(::bgs::protocol::presence::v1::QueryRequest const* request, std::function<void(::bgs::protocol::presence::v1::QueryResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Query(bgs.protocol.presence.v1.QueryRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 4, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::presence::v1::QueryResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 4, request, std::move(callback)); } void PresenceService::Ownership(::bgs::protocol::presence::v1::OwnershipRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.Ownership(bgs.protocol.presence.v1.OwnershipRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 5, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 5, request, std::move(callback)); } void PresenceService::SubscribeNotification(::bgs::protocol::presence::v1::SubscribeNotificationRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method PresenceService.SubscribeNotification(bgs.protocol.presence.v1.SubscribeNotificationRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 7, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 7, request, std::move(callback)); } void PresenceService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/presence_types.pb.h b/src/server/proto/Client/presence_types.pb.h index c77b517bd58..1aa1c3c29f0 100644 --- a/src/server/proto/Client/presence_types.pb.h +++ b/src/server/proto/Client/presence_types.pb.h @@ -28,7 +28,7 @@ #include "attribute_types.pb.h" #include "entity_types.pb.h" #include "channel_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/profanity_filter_config.pb.h b/src/server/proto/Client/profanity_filter_config.pb.h index ff3788f2c49..1270c25b376 100644 --- a/src/server/proto/Client/profanity_filter_config.pb.h +++ b/src/server/proto/Client/profanity_filter_config.pb.h @@ -24,7 +24,7 @@ #include <google/protobuf/repeated_field.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/report_service.pb.cc b/src/server/proto/Client/report_service.pb.cc index 216aeb23a2f..c922eccba99 100644 --- a/src/server/proto/Client/report_service.pb.cc +++ b/src/server/proto/Client/report_service.pb.cc @@ -861,11 +861,12 @@ google::protobuf::ServiceDescriptor const* ReportService::descriptor() { void ReportService::SendReport(::bgs::protocol::report::v1::SendReportRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ReportService.SendReport(bgs.protocol.report.v1.SendReportRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void ReportService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/resource_service.pb.cc b/src/server/proto/Client/resource_service.pb.cc index d3b5466487f..4c60b14c4f6 100644 --- a/src/server/proto/Client/resource_service.pb.cc +++ b/src/server/proto/Client/resource_service.pb.cc @@ -438,11 +438,12 @@ google::protobuf::ServiceDescriptor const* ResourcesService::descriptor() { void ResourcesService::GetContentHandle(::bgs::protocol::resources::v1::ContentHandleRequest const* request, std::function<void(::bgs::protocol::ContentHandle const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method ResourcesService.GetContentHandle(bgs.protocol.resources.v1.ContentHandleRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::ContentHandle response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void ResourcesService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/role_types.pb.h b/src/server/proto/Client/role_types.pb.h index 33abb25e127..b62d6465764 100644 --- a/src/server/proto/Client/role_types.pb.h +++ b/src/server/proto/Client/role_types.pb.h @@ -25,7 +25,7 @@ #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> #include "attribute_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/rpc_config.pb.h b/src/server/proto/Client/rpc_config.pb.h index 08bc1675f57..15a5b565469 100644 --- a/src/server/proto/Client/rpc_config.pb.h +++ b/src/server/proto/Client/rpc_config.pb.h @@ -24,7 +24,7 @@ #include <google/protobuf/repeated_field.h> #include <google/protobuf/extension_set.h> #include <google/protobuf/unknown_field_set.h> -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/rpc_types.pb.h b/src/server/proto/Client/rpc_types.pb.h index 242947a32d1..b477bb5a7b0 100644 --- a/src/server/proto/Client/rpc_types.pb.h +++ b/src/server/proto/Client/rpc_types.pb.h @@ -27,7 +27,7 @@ #include "global_extensions/method_options.pb.h" // IWYU pragma: export #include "global_extensions/service_options.pb.h" // IWYU pragma: export #include "global_extensions/field_options.pb.h" // IWYU pragma: export -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { diff --git a/src/server/proto/Client/user_manager_service.pb.cc b/src/server/proto/Client/user_manager_service.pb.cc index ba4d0c63190..be91453644b 100644 --- a/src/server/proto/Client/user_manager_service.pb.cc +++ b/src/server/proto/Client/user_manager_service.pb.cc @@ -4107,81 +4107,89 @@ google::protobuf::ServiceDescriptor const* UserManagerService::descriptor() { void UserManagerService::Subscribe(::bgs::protocol::user_manager::v1::SubscribeRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::SubscribeResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.Subscribe(bgs.protocol.user_manager.v1.SubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 1, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::user_manager::v1::SubscribeResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 1, request, std::move(callback)); } void UserManagerService::AddRecentPlayers(::bgs::protocol::user_manager::v1::AddRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::AddRecentPlayersResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.AddRecentPlayers(bgs.protocol.user_manager.v1.AddRecentPlayersRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 10, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::user_manager::v1::AddRecentPlayersResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 10, request, std::move(callback)); } void UserManagerService::ClearRecentPlayers(::bgs::protocol::user_manager::v1::ClearRecentPlayersRequest const* request, std::function<void(::bgs::protocol::user_manager::v1::ClearRecentPlayersResponse const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.ClearRecentPlayers(bgs.protocol.user_manager.v1.ClearRecentPlayersRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 11, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::user_manager::v1::ClearRecentPlayersResponse response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 11, request, std::move(callback)); } void UserManagerService::BlockPlayer(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.BlockPlayer(bgs.protocol.user_manager.v1.BlockPlayerRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 20, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 20, request, std::move(callback)); } void UserManagerService::UnblockPlayer(::bgs::protocol::user_manager::v1::UnblockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.UnblockPlayer(bgs.protocol.user_manager.v1.UnblockPlayerRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 21, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 21, request, std::move(callback)); } void UserManagerService::BlockPlayerForSession(::bgs::protocol::user_manager::v1::BlockPlayerRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.BlockPlayerForSession(bgs.protocol.user_manager.v1.BlockPlayerRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 40, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 40, request, std::move(callback)); } void UserManagerService::LoadBlockList(::bgs::protocol::EntityId const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.LoadBlockList(bgs.protocol.EntityId{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 50, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 50, request, std::move(callback)); } void UserManagerService::Unsubscribe(::bgs::protocol::user_manager::v1::UnsubscribeRequest const* request, std::function<void(::bgs::protocol::NoData const*)> responseCallback) { TC_LOG_DEBUG("service.protobuf", "%s Server called client method UserManagerService.Unsubscribe(bgs.protocol.user_manager.v1.UnsubscribeRequest{ %s })", GetCallerInfo().c_str(), request->ShortDebugString().c_str()); - SendRequest(service_hash_, 51, request, [callback{ std::move(responseCallback) }](MessageBuffer buffer) { + std::function<void(MessageBuffer)> callback = [responseCallback](MessageBuffer buffer) -> void { ::bgs::protocol::NoData response; if (response.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) - callback(&response); - }); + responseCallback(&response); + }; + SendRequest(service_hash_, 51, request, std::move(callback)); } void UserManagerService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) { diff --git a/src/server/proto/Client/user_manager_types.pb.h b/src/server/proto/Client/user_manager_types.pb.h index 93b4a04e802..cc736031298 100644 --- a/src/server/proto/Client/user_manager_types.pb.h +++ b/src/server/proto/Client/user_manager_types.pb.h @@ -26,7 +26,7 @@ #include <google/protobuf/unknown_field_set.h> #include "entity_types.pb.h" #include "attribute_types.pb.h" -#include "Define.h" // for TRINITY_SHARED_API +#include "Define.h" // for TC_SHARED_API // @@protoc_insertion_point(includes) namespace bgs { |