← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.h

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

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
 
26
28
namespace drizzled {
27
29
namespace generator {
28
30
 
29
 
class Functions
 
31
class DRIZZLED_API Functions
30
32
{
31
33
  Session &session;
 
34
  typedef std::vector <std::string> vector;
32
35
  std::string function_name;
33
 
  plugin::Function::UdfMap::const_iterator udf_iter;
 
36
  vector function_list;
 
37
  vector::iterator iter;
34
38
 
35
39
public:
36
40
 
38
42
 
39
43
  operator std::string*()
40
44
  {
41
 
    if (udf_iter == plugin::Function::getMap().end())
 
45
    if (iter == function_list.end())
42
46
      return NULL;
43
47
 
44
 
    function_name= (*udf_iter).first;
45
 
    udf_iter++;
 
48
    function_name= *iter;
 
49
    iter++;
46
50
 
47
51
    return &function_name;
48
52
  }