← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_function_container.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 01:45:34 UTC
  • mfrom: (1878.5.8 catalogs)
  • Revision ID: brian@tangent.org-20101028014534-b6qp4wp6crj60h7k
Merge in catalog tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_function_container.cc
1
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2010 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2010 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
22
 
#include <drizzled/plugin/table_function.h>
23
 
#include <drizzled/table_function_container.h>
 
21
#include "config.h"
 
22
#include "drizzled/plugin/table_function.h"
 
23
#include "drizzled/table_function_container.h"
24
24
 
25
25
#include <iostream>
26
26
 
68
68
 
69
69
void TableFunctionContainer::addFunction(plugin::TableFunction *tool)
70
70
{
71
 
  std::pair<ToolMap::iterator, bool> ret=
72
 
    table_map.insert(std::make_pair(tool->getPath(), tool));
 
71
  std::pair<ToolMap::iterator, bool> ret;
 
72
 
 
73
  ret= table_map.insert(std::make_pair(tool->getPath(), tool));
73
74
  assert(ret.second == true);
74
75
}
75
76