← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/user_var_entry.cc

  • Committer: Monty Taylor
  • Date: 2010-02-04 08:14:46 UTC
  • mfrom: (1277.2.1 build) (1280.2.1 build)
  • mto: This revision was merged to the branch mainline in revision 1283.
  • Revision ID: mordred@inaugust.com-20100204081446-ldh9m486va30uap6
Put everything in drizzled into drizzled namespace.
Put internal stuff into drizzled::internal namespace.
Removed some cruft.
Now every symbol that is shipped in a header is in the drizzled namespace
and everything in the server that's not shipped is labeled internal. woot. 
Removed a lot of the extra extern "C" stuff that was in there. Less ugliness for
internal callbacks now for Sun Studio.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/user_var_entry.cc
21
21
#include <drizzled/session.h>
22
22
#include "drizzled/internal/m_string.h"
23
23
 
 
24
namespace drizzled
 
25
{
 
26
 
24
27
/** Get the value of a variable as a double. */
25
28
 
26
29
double user_var_entry::val_real(bool *null_value)
40
43
    return result;
41
44
  }
42
45
  case STRING_RESULT:
43
 
    return my_atof(value);                      // This is null terminated
 
46
    return internal::my_atof(value);                      // This is null terminated
44
47
  case ROW_RESULT:
45
48
    assert(1);                          // Impossible
46
49
    break;
70
73
  case STRING_RESULT:
71
74
  {
72
75
    int error;
73
 
    return my_strtoll10(value, (char**) 0, &error);// String is null terminated
 
76
    return internal::my_strtoll10(value, (char**) 0, &error);// String is null terminated
74
77
  }
75
78
  case ROW_RESULT:
76
79
    assert(1);                          // Impossible
204
207
 
205
208
  return false;
206
209
}
 
210
 
 
211
} /* namespace drizzled */