← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/user.h

  • Committer: Lee Bieber
  • Date: 2011-03-29 22:31:41 UTC
  • mfrom: (2257.1.3 build)
  • Revision ID: kalebral@gmail.com-20110329223141-yxc22h3l2he58sk0
Merge Andrew - 743842: Build failure using GCC 4.6
Merge Stewart - 738022: CachedDirectory silently fails to add entries if stat() fails
Merge Olaf - Common fwd: add copyright, add more declaration

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/user.h
22
22
 
23
23
#include <string>
24
24
#include <boost/shared_ptr.hpp>
 
25
#include <drizzled/common_fwd.h>
25
26
#include <drizzled/identifier.h>
26
27
#include <drizzled/visibility.h>
27
28
 
36
37
class User : public Identifier
37
38
{
38
39
public:
39
 
  typedef boost::shared_ptr<User> shared_ptr;
40
 
  typedef boost::shared_ptr<const User> const_shared_ptr;
41
 
  DRIZZLED_API static shared_ptr make_shared();
 
40
  DRIZZLED_API static user::mptr make_shared();
42
41
 
43
42
  enum PasswordType
44
43
  {