← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzletest.cc

  • Committer: Monty Taylor
  • Date: 2010-07-31 21:37:09 UTC
  • mto: (1680.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1681.
  • Revision ID: mordred@inaugust.com-20100731213709-p2tlj3txhwdi9339
Removed our unordered wrappers. We use Boost now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzletest.cc
60
60
#include PCRE_HEADER
61
61
 
62
62
#include <stdarg.h>
63
 
#include <drizzled/unordered_map.h>
 
63
#include <boost/unordered_map.hpp>
64
64
 
65
65
#include "errname.h"
66
66
 
215
215
VAR var_reg[10];
216
216
 
217
217
 
218
 
unordered_map<string, VAR *> var_hash;
 
218
boost::unordered_map<string, VAR *> var_hash;
219
219
 
220
220
struct st_connection
221
221
{
1709
1709
      die("Too long variable name: %s", save_var_name);
1710
1710
 
1711
1711
    string save_var_name_str(save_var_name, length);
1712
 
    unordered_map<string, VAR*>::iterator iter=
 
1712
    boost::unordered_map<string, VAR*>::iterator iter=
1713
1713
      var_hash.find(save_var_name_str);
1714
1714
    if (iter == var_hash.end())
1715
1715
    {
1747
1747
static VAR *var_obtain(const char *name, int len)
1748
1748
{
1749
1749
  string var_name(name, len);
1750
 
  unordered_map<string, VAR*>::iterator iter=
 
1750
  boost::unordered_map<string, VAR*>::iterator iter=
1751
1751
    var_hash.find(var_name);
1752
1752
  if (iter != var_hash.end())
1753
1753
    return (*iter).second;