← 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: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

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/plugin/function.h"
25
 
#include "drizzled/session.h"
 
23
#include <drizzled/generator.h>
 
24
#include <drizzled/function_container.h>
 
25
#include <drizzled/plugin/function.h>
 
26
#include <drizzled/session.h>
26
27
 
27
28
using namespace std;
28
29
 
34
35
Functions::Functions(Session &arg) :
35
36
  session(arg)
36
37
{
37
 
  udf_iter= plugin::Function::getMap().begin();
 
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();
38
51
}
39
52
 
40
53
} /* namespace generator */