← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/generator/functions.cc

  • Committer: Brian Aker
  • Date: 2010-12-27 20:04:50 UTC
  • mto: (2060.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2063.
  • Revision ID: brian@tangent.org-20101227200450-dmxpemwyfmlinlnm
Merge in first pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/generator/functions.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
 
#include <drizzled/generator.h>
24
 
#include <drizzled/function_container.h>
25
 
#include <drizzled/plugin/function.h>
26
 
#include <drizzled/session.h>
 
23
#include "drizzled/generator.h"
 
24
#include "drizzled/plugin/function.h"
 
25
#include "drizzled/session.h"
27
26
 
28
27
using namespace std;
29
28
 
35
34
Functions::Functions(Session &arg) :
36
35
  session(arg)
37
36
{
38
 
  function_list.reserve(plugin::Function::getMap().size() + FunctionContainer::getMap().size());
39
 
 
40
 
  std::transform(FunctionContainer::getMap().begin(),
41
 
                 FunctionContainer::getMap().end(),
42
 
                 std::back_inserter(function_list),
43
 
                 boost::bind(&FunctionContainer::Map::value_type::first, _1) );
44
 
 
45
 
  std::transform(plugin::Function::getMap().begin(),
46
 
                 plugin::Function::getMap().end(),
47
 
                 std::back_inserter(function_list),
48
 
                 boost::bind(&plugin::Function::Map::value_type::first, _1) );
49
 
 
50
 
  iter= function_list.begin();
 
37
  udf_iter= plugin::Function::getMap().begin();
51
38
}
52
39
 
53
40
} /* namespace generator */