X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/b4e3971acd4927a3409a5a5433a326e6462ceeae..31b24cededa8b07468cb5e1c49b2a208fe19173e:/include/stg/user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 474eba6a..7d68e734 100644
--- 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 <map>
 #include <sstream>
 #include <iostream>
 
@@ -26,14 +27,13 @@ $Author: faust $
 
 extern volatile time_t stgTime;
 //-----------------------------------------------------------------------------
-//template<typename varT>
 class USER_PROPERTY_BASE {
 public:
     virtual std::string ToString() const = 0;
 };
 //-----------------------------------------------------------------------------
 template<typename varT>
-class USER_PROPERTY : USER_PROPERTY_BASE {
+class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:
     USER_PROPERTY(varT & val);
     virtual ~USER_PROPERTY();
@@ -124,7 +124,7 @@ private:
     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);
 
@@ -138,6 +138,7 @@ public:
     void SetProperties(const USER_PROPERTIES & p) { stat = p.stat; conf = p.conf; }
 
     std::string GetPropertyValue(const std::string & name) const;
+    bool                  Exists(const std::string & name) const;
 
     USER_PROPERTY_LOGGED<double>            cash;
     USER_PROPERTY_LOGGED<DIR_TRAFF>         up;
@@ -390,11 +391,18 @@ else
 inline
 std::string USER_PROPERTIES::GetPropertyValue(const std::string & name) const
 {
-std::map<std::string, USER_PROPERTY_BASE*>::iterator it = properties.find(name);
+std::map<std::string, USER_PROPERTY_BASE*>::const_iterator it = properties.find(name);
 if (it == properties.end())
     return "";
 return it->second->ToString();
 }
+//-----------------------------------------------------------------------------
+inline
+bool USER_PROPERTIES::Exists(const std::string & name) const
+{
+if (properties.find(name)!=properties.end()) return true;
+return false;
+}
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
@@ -409,7 +417,7 @@ template<typename varT>
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {
-std::stringstream stream;
+std::ostringstream stream;
 stream << value;
 return stream.str();
 }