← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.h

  • Committer: Olaf van der Spek
  • Date: 2011-03-17 14:00:56 UTC
  • mto: (2241.2.7 refactor)
  • mto: This revision was merged to the branch mainline in revision 2245.
  • Revision ID: olafvdspek@gmail.com-20110317140056-i3cye1d6uyt5zlt1
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.h
40
40
#include <drizzled/open_tables_state.h>
41
41
#include <drizzled/pthread_globals.h>
42
42
#include <drizzled/query_id.h>
43
 
#include <drizzled/session/property_map.h>
44
43
#include <drizzled/session/table_messages.h>
45
44
#include <drizzled/session/transactions.h>
46
45
#include <drizzled/sql_list.h>
49
48
#include <drizzled/statistics_variables.h>
50
49
#include <drizzled/system_variables.h>
51
50
#include <drizzled/transaction_context.h>
52
 
#include <drizzled/util/storable.h>
53
51
#include <drizzled/var.h>
54
52
#include <drizzled/visibility.h>
55
53
#include <drizzled/util/find_ptr.h>
89
87
  class Singular; 
90
88
}
91
89
 
 
90
namespace util
 
91
{
 
92
  class Storable;
 
93
}
 
94
 
92
95
typedef class Item COND;
93
96
 
94
97
class CopyField;
1436
1439
  int setup_conds(TableList *leaves, COND **conds);
1437
1440
  int lock_tables(TableList *tables, uint32_t count, bool *need_reopen);
1438
1441
 
1439
 
  template<class T>
1440
 
  T* getProperty(const std::string &arg)
 
1442
  template <class T>
 
1443
  T* getProperty(const std::string& name)
1441
1444
  {
1442
 
    return static_cast<T*>(getProperty0(arg));
 
1445
    return static_cast<T*>(getProperty0(name));
1443
1446
  }
1444
1447
 
1445
 
  template<class T>
1446
 
  T* setProperty(const std::string &arg, T *value)
 
1448
  template <class T>
 
1449
  T setProperty(const std::string& name, T value)
1447
1450
  {
1448
 
    setProperty0(arg, value);
 
1451
    setProperty0(name, value);
1449
1452
    return value;
1450
1453
  }
1451
1454