Correcting small mistakes

[stg.git] / include / stg / user_property.h

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index f53b416d31845d1164e099fca4c8355e641f14d7..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 <map>
 #include <sstream>
 #include <iostream>
 
@@ -32,7 +33,7 @@ public:
 };
 //-----------------------------------------------------------------------------
 template<typename varT>
-class USER_PROPERTY : USER_PROPERTY_BASE {
+class USER_PROPERTY : public USER_PROPERTY_BASE {
 public:
     USER_PROPERTY(varT & val);
     virtual ~USER_PROPERTY();
@@ -123,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);
 
@@ -386,12 +387,13 @@ 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();
+return it->second->ToString();
 }
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
@@ -407,7 +409,7 @@ template<typename varT>
 inline
 std::string USER_PROPERTY<varT>::ToString() const
 {
-std::stringstream stream;
+std::ostringstream stream;
 stream << value;
 return stream.str();
 }