Correcting small mistakes

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 6eb17666487952be8147d4bd761e9e49e1d9596a..aee32e3e34a6bedb0949aeaac7e3c9344c7cb717 100644 (file)
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -12,6 +12,7 @@ $Author: faust $
 #include <ctime>
 #include <string>
 #include <set>
 #include <ctime>
 #include <string>
 #include <set>

+#include <map>

 #include <sstream>
 #include <iostream>
 
 #include <sstream>
 #include <iostream>
 


@@ -26,7 +27,6 @@ $Author: faust $
 
 extern volatile time_t stgTime;
 //-----------------------------------------------------------------------------
 
 extern volatile time_t stgTime;
 //-----------------------------------------------------------------------------

-//template<typename varT>

 class USER_PROPERTY_BASE {
 public:
     virtual std::string ToString() const = 0;
 class USER_PROPERTY_BASE {
 public:
     virtual std::string ToString() const = 0;


@@ -124,7 +124,7 @@ private:
     USER_STAT stat;
     USER_CONF conf;
 
     USER_STAT stat;
     USER_CONF conf;
 

-    std::map<std::string, USER_PROPERTY_BASE*> properties;
+    std::map<std::string, USER_PROPERTY_BASE *> properties;

 public:
     USER_PROPERTIES(const std::string & sd);
 
 public:
     USER_PROPERTIES(const std::string & sd);
 


@@ -409,7 +409,7 @@ template<typename varT>
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {

-std::stringstream stream;
+std::ostringstream stream;

 stream << value;
 return stream.str();
 }
 stream << value;
 return stream.str();
 }

diff --git a/include/stg/users.h b/include/stg/users.h
index ed9af90172639606c22a6a6566992fcdfd410862..2ba238332297b5b70d0267dc4e967d5aacec9428 100644 (file)
--- a/include/stg/users.h
+++ b/include/stg/users.h
@@ -60,7 +60,6 @@ public:
 
     virtual int  Start() = 0;
     virtual int  Stop() = 0;
 
     virtual int  Start() = 0;
     virtual int  Stop() = 0;

-

 };
 
 #endif
 };
 
 #endif

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index b7bb91f58b08c9382b79310b2f6431f76294c539..eb61e2d5d5d31975f50db3d0670acd3765b3ab2f 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -271,6 +271,7 @@ if (settings->ReadSettings())
     WriteServLog("ReadSettings error. %s", settings->GetStrError().c_str());
     exit(1);
     }
     WriteServLog("ReadSettings error. %s", settings->GetStrError().c_str());
     exit(1);
     }

+

 #ifndef NO_DAEMON
 std::string startFile(settings->GetConfDir() + START_FILE);
 #endif
 #ifndef NO_DAEMON
 std::string startFile(settings->GetConfDir() + START_FILE);
 #endif

diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 08087883a9fb0e94805413d2f922bac3ee15882d..ac4dc9a9498aa62b0fa46bfed4f8218ec8f5a0fe 100644 (file)
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1476,38 +1476,13 @@ std::string USER_IMPL::GetParamValue(const std::string & name) const
 {
 if (name == "id")
     {
 {
 if (name == "id")
     {

-    std::stringstream stream;
+    std::ostringstream stream;

     stream << id;
     return stream.str();;
     }
 if (name == "login")        return login;
 if (name == "ip")           return currIP.ToString();
 return property.GetPropertyValue(name);
     stream << id;
     return stream.str();;
     }
 if (name == "login")        return login;
 if (name == "ip")           return currIP.ToString();
 return property.GetPropertyValue(name);

-//if (name == "freeMb")       return property.freeMb.ToString();
-//if (name == "passive")      return property.passive.ToString();
-//if (name == "disabled")     return property.disabled.ToString();
-//if (name == "alwaysOnline") return property.alwaysOnline.ToString();
-//if (name == "tariffName")   return property.tariffName;
-//if (name == "nextTariff")   return property.nextTariff;
-//if (name == "address")      return property.address;
-//if (name == "note")         return property.note;
-//if (name == "group")        return property.group;
-//if (name == "email")        return property.email;
-//if (name == "phone")        return property.phone;
-//if (name == "realName")     return property.realName;
-//if (name == "credit")       return property.credit.ToString();
-//if (name == "userdata0")    return property.userdata0;
-//if (name == "userdata1")    return property.userdata1;
-//if (name == "userdata2")    return property.userdata2;
-//if (name == "userdata3")    return property.userdata3;
-//if (name == "userdata4")    return property.userdata4;
-//if (name == "userdata5")    return property.userdata5;
-//if (name == "userdata6")    return property.userdata6;
-//if (name == "userdata7")    return property.userdata7;
-//if (name == "userdata8")    return property.userdata8;
-//if (name == "userdata9")    return property.userdata9;
-//if (name == "cash")         return property.cash.ToString();
-//return "";

 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------