X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5fdfdde84e79b2430924e8241bb3ef4579214f2f..296c906e2689b9b5dc26d2f2d3e1e2d9e1662d3b:/projects/stargazer/plugins/other/smux/sensors.cpp diff --git a/projects/stargazer/plugins/other/smux/sensors.cpp b/projects/stargazer/plugins/other/smux/sensors.cpp index f52a413b..d868e37b 100644 --- a/projects/stargazer/plugins/other/smux/sensors.cpp +++ b/projects/stargazer/plugins/other/smux/sensors.cpp @@ -1,17 +1,20 @@ -#include - -#include "stg/INTEGER.h" +#include "sensors.h" #include "stg/user.h" -#include "sensors.h" +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wold-style-cast" +#include "stg/INTEGER.h" +#pragma GCC diagnostic pop -bool UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const +void UsersSensor::GetValue(ObjectSyntax_t * objectSyntax) const { int handle = users.OpenSearch(); assert(handle && "USERS::OpenSearch is always correct"); -USER_PTR user; +STG::User* user; size_t count = 0; while (!users.SearchNext(handle, &user)) { @@ -22,7 +25,6 @@ while (!users.SearchNext(handle, &user)) users.CloseSearch(handle); ValueToOS(count, objectSyntax); -return true; } #ifdef DEBUG @@ -31,7 +33,7 @@ std::string UsersSensor::ToString() const int handle = users.OpenSearch(); assert(handle && "USERS::OpenSearch is always correct"); -USER_PTR user; +STG::User* user; size_t count = 0; while (!users.SearchNext(handle, &user)) { @@ -41,13 +43,11 @@ while (!users.SearchNext(handle, &user)) users.CloseSearch(handle); -std::string res; -x2str(count, res); -return res; +return std::to_string(count); } #endif -bool ActiveUsersSensor::UserPredicate(USER_PTR userPtr) const +bool ActiveUsersSensor::UserPredicate(STG::User* userPtr) const { if (!userPtr->GetConnected()) return false;