Merge branch 'master' of http://git.aasimon.org/public/pracro

1 files changed, 6 insertions, 6 deletions

diff --git a/server/src/session.h b/server/src/session.h
index b5c31d7..4d1ed12 100644
--- a/server/src/session.h
+++ b/server/src/session.h
@@ -95,14 +95,14 @@ public:
    * Create a new session, with a unique id. Insert it into the session list,
    * and return its pointer.
    */
-  Session *newSession(std::string patientid, std::string templ)
+  Session *newLockedSession(std::string patientid, std::string templ)
     throw(SessionAlreadyActive);
 
   /**
    * Lookup session in session list. Returns the session or NULL if no session
    * exists with that sessionid.
    */
-  Session *session(std::string sessionid);
+  Session *lockedSession(std::string sessionid);
 
   /**
    * Remove session from the session list and return its pointer. It is up to
@@ -136,13 +136,13 @@ private:
   Mutex mutex;
 };
 
-class SessionAutolock {
+class SessionAutounlock {
 public:
-  SessionAutolock(Session &session);
-  ~SessionAutolock();
+  SessionAutounlock(Session **session);
+  ~SessionAutounlock();
 
 private:
-  Session &session;
+  Session **session;
 };
 
 #endif/*__PRACRO_SESSION_H__*/