1 files changed, 6 insertions, 6 deletions
diff --git a/src/Common/UserCache.h b/src/Common/UserCache.h
index c579221..6981172 100644
--- a/src/Common/UserCache.h
+++ b/src/Common/UserCache.h
@@ -45,12 +45,12 @@ class MAD_COMMON_EXPORT UserCache : public UserDBBackend, private boost::noncopy
     boost::recursive_mutex mutex;
 
     boost::shared_ptr<const std::map<unsigned long, UserInfo> > users;
-    boost::shared_ptr<std::map<std::string, unsigned long> > userNames;
+    boost::shared_ptr<std::map<Core::String, unsigned long> > userNames;
     Core::Exception userException;
     boost::posix_time::ptime userTime;
 
     boost::shared_ptr<const std::map<unsigned long, GroupInfo> > groups;
-    boost::shared_ptr<std::map<std::string, unsigned long> > groupNames;
+    boost::shared_ptr<std::map<Core::String, unsigned long> > groupNames;
     Core::Exception groupException;
     boost::posix_time::ptime groupTime;
 
@@ -62,12 +62,12 @@ class MAD_COMMON_EXPORT UserCache : public UserDBBackend, private boost::noncopy
   protected:
     virtual boost::shared_ptr<const std::map<unsigned long, UserInfo> > getUserList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const UserInfo> getUserInfo(unsigned long uid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
-    virtual boost::shared_ptr<const UserInfo> getUserInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
+    virtual boost::shared_ptr<const UserInfo> getUserInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const std::set<unsigned long> > getUserGroupList(unsigned long uid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
 
     virtual boost::shared_ptr<const std::map<unsigned long, GroupInfo> > getGroupList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const GroupInfo> getGroupInfo(unsigned long gid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
-    virtual boost::shared_ptr<const GroupInfo> getGroupInfoByName(const std::string &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
+    virtual boost::shared_ptr<const GroupInfo> getGroupInfoByName(const Core::String &name, boost::posix_time::ptime *timestamp) throw(Core::Exception);
     virtual boost::shared_ptr<const std::set<unsigned long> > getGroupUserList(unsigned long gid, boost::posix_time::ptime *timestamp) throw(Core::Exception);
 
     virtual boost::shared_ptr<const std::multimap<unsigned long, unsigned long> > getFullUserGroupList(boost::posix_time::ptime *timestamp) throw(Core::Exception);
@@ -115,7 +115,7 @@ class MAD_COMMON_EXPORT UserCache : public UserDBBackend, private boost::noncopy
     }
 
 
-    virtual void setPassword(unsigned long uid, const std::string &password) throw(Core::Exception) {
+    virtual void setPassword(unsigned long uid, const Core::String &password) throw(Core::Exception) {
       backend->setPassword(uid, password);
     }
 
@@ -124,7 +124,7 @@ class MAD_COMMON_EXPORT UserCache : public UserDBBackend, private boost::noncopy
     userGroupTime(boost::posix_time::not_a_date_time) {}
 
   public:
-    virtual const std::string& getName() {
+    virtual const Core::String& getName() {
       return backend->getName();
     }
 };