Merge remote-tracking branch 'github/master'

[stg.git] / 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 f52a413b7aeff6543e3a4ccf32da5e67012cc0cf..d868e37bafc56f88739cd452c1e93a7528421b24 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.cpp
+++ b/projects/stargazer/plugins/other/smux/sensors.cpp
@@ -1,17 +1,20 @@
-#include <cassert>
-
-#include "stg/INTEGER.h"
+#include "sensors.h"
 
 #include "stg/user.h"
 
-#include "sensors.h"
+#include <cassert>
+
+#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;