Added all tariff options.

[stg.git] / stglibs / conffiles.lib / conffiles.cpp

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index 3c3f3917a986951ab357a8bb0043b9a114205b0f..302c365194ddd0cd6d08de0f4521a786c762c5ed 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -74,7 +74,7 @@ std::string Trim(std::string val)
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------
 return TrimR(TrimL(val));
 }
 //---------------------------------------------------------------------------

-}
+} // namespace anonymous

 
 //---------------------------------------------------------------------------
 bool StringCaseCmp(const std::string & str1, const std::string & str2)
 
 //---------------------------------------------------------------------------
 bool StringCaseCmp(const std::string & str1, const std::string & str2)


@@ -184,7 +184,7 @@ const std::map<std::string, std::string>::const_iterator it(param_val.find(param
 if (it != param_val.end())
     {
     char *res;
 if (it != param_val.end())
     {
     char *res;

-    *val = strtol(it->second.c_str(), &res, 10);
+    *val = static_cast<int>(strtol(it->second.c_str(), &res, 10));

     if (*res != 0)
         {
         *val = defaultVal; //Error!
     if (*res != 0)
         {
         *val = defaultVal; //Error!


@@ -204,7 +204,7 @@ const std::map<std::string, std::string>::const_iterator it(param_val.find(param
 if (it != param_val.end())
     {
     char *res;
 if (it != param_val.end())
     {
     char *res;

-    *val = strtoul(it->second.c_str(), &res, 10);
+    *val = static_cast<unsigned int>(strtoul(it->second.c_str(), &res, 10));

     if (*res != 0)
         {
         *val = defaultVal; //Error!
     if (*res != 0)
         {
         *val = defaultVal; //Error!