From 09a9984d2d13448614d92b8e3ab4cdf10abc0b68 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 27 Jan 2011 16:12:52 +0200 Subject: [PATCH 1/1] =?utf8?q?=D0=A2=D0=B8=D0=BC=D1=87=D0=B0=D1=81=D0=BE?= =?utf8?q?=D0=B2=D0=BE=20=D0=BF=D1=80=D0=B8=D0=B1=D1=80=D0=B0=D0=BD=D0=BE?= =?utf8?q?=20=D1=82=D0=B8=D0=BF=20size=5Ft=20=D1=96=D0=B7=20=D0=BD=D0=B0?= =?utf8?q?=D0=BB=D0=B0=D1=88=D1=82=D1=83=D0=B2=D0=B0=D0=BD=D0=BD=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- projects/stargazer/settings.cpp | 2 +- projects/stargazer/settings.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/stargazer/settings.cpp b/projects/stargazer/settings.cpp index 84de336b..7aa2950f 100644 --- a/projects/stargazer/settings.cpp +++ b/projects/stargazer/settings.cpp @@ -317,7 +317,7 @@ while (node) if (strcasecmp(node->getName(), "ExecutersNum") == 0) { - if (ParseUnsignedInRange(node->getValue(0), 1, 1024, static_cast(&executersNum)) != 0) + if (ParseUnsignedInRange(node->getValue(0), 1, 1024, &executersNum) != 0) { strError = "Incorrect ExecutersNum value: \'" + string(node->getValue(0)) + "\'"; return -1; diff --git a/projects/stargazer/settings.h b/projects/stargazer/settings.h index 03ace0a0..711b43e6 100644 --- a/projects/stargazer/settings.h +++ b/projects/stargazer/settings.h @@ -69,7 +69,7 @@ public: string GetStrError() const { return strError; }; int GetExecMsgKey() const { return stgExecMsgKey; }; - size_t GetExecutersNum() const { return executersNum; }; + unsigned GetExecutersNum() const { return executersNum; }; const string & GetDirName(int num) const { return dirName[num]; }; const string & GetConfDir() const { return confDir; }; const string & GetScriptDir() const { return scriptDir; }; @@ -125,7 +125,7 @@ private: unsigned detailStatWritePeriod; unsigned statWritePeriod; int stgExecMsgKey; - size_t executersNum; + unsigned executersNum; bool fullFee; unsigned dayFee; // ÄÅÎØ ÓÎÑÔÉÑ ÁÂÏÎÐÌÁÔÙ unsigned dayResetTraff; // îÁÞÁÌÏ ÕÞÅÔÎÏÇÏ ÐÅÒÉÏÄÁ: ÄÅÎØ ÏÂÎÕÌÅÎÉÑ ÔÒÁÆÉËÁ É ÓÍÅÎÙ ÔÁÒÉÆÁ -- 2.44.2