← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/locks.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:
plugin/user_locks/locks.h
23
23
#include <boost/unordered_map.hpp>
24
24
#include <boost/unordered/unordered_set.hpp>
25
25
 
26
 
#include "plugin/user_locks/lock.h"
 
26
#include <plugin/user_locks/lock.h>
27
27
 
28
28
#include <string>
29
29
 
30
 
#include "drizzled/session.h"
31
 
#include "drizzled/util/string.h"
32
 
 
33
 
 
34
 
#ifndef PLUGIN_USER_LOCKS_LOCKS_H
35
 
#define PLUGIN_USER_LOCKS_LOCKS_H
 
30
#include <drizzled/session.h>
 
31
#include <drizzled/util/string.h>
 
32
 
 
33
 
 
34
#pragma once
36
35
 
37
36
namespace user_locks {
38
37
 
76
75
 
77
76
} /* namespace user_locks */
78
77
 
79
 
#endif /* PLUGIN_USER_LOCKS_LOCKS_H */