← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.h

  • Committer: Brian Aker
  • Date: 2010-10-28 17:12:01 UTC
  • mfrom: (1887.1.3 merge)
  • Revision ID: brian@tangent.org-20101028171201-baj6l1bnntn1s4ad
Merge in POTFILES changes.

Show diffs side-by-side

added added

removed removed

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