← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.h

  • Committer: Mark Atwood
  • Date: 2011-06-25 15:38:53 UTC
  • mfrom: (2318.6.78 refactor16)
  • Revision ID: me@mark.atwood.name-20110625153853-za5fjiwd3z0aykdd
merge lp:~olafvdspek/drizzle/refactor16

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/functions.h
21
21
#pragma once
22
22
 
23
23
#include <drizzled/plugin/function.h>
24
 
 
25
24
#include <drizzled/visibility.h>
26
25
 
27
26
namespace drizzled {
29
28
 
30
29
class DRIZZLED_API Functions
31
30
{
32
 
  Session &session;
33
 
  typedef std::vector <std::string> vector;
34
 
  std::string function_name;
35
 
  vector function_list;
36
 
  vector::iterator iter;
37
 
 
38
31
public:
39
 
 
40
 
  Functions(Session &arg);
 
32
  Functions(Session&);
41
33
 
42
34
  operator std::string*()
43
35
  {
44
 
    if (iter == function_list.end())
 
36
    if (iter == functions.end())
45
37
      return NULL;
46
 
 
47
 
    function_name= *iter;
48
 
    iter++;
49
 
 
 
38
    function_name= *iter++;
50
39
    return &function_name;
51
40
  }
 
41
  typedef std::vector<std::string> functions_t;
 
42
  functions_t functions;
 
43
 
 
44
  std::string function_name;
 
45
  functions_t::iterator iter;
 
46
 
52
47
};
53
48
 
54
49
} /* namespace generator */