← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/error.h

  • Committer: Brian Aker
  • Date: 2011-01-04 22:27:38 UTC
  • mfrom: (2041.3.16 session-fix)
  • mto: This revision was merged to the branch mainline in revision 2055.
  • Revision ID: brian@tangent.org-20110104222738-4r3hrsxrlbuildrg
Merge in cleanup of error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/error.h
23
23
#include <string>
24
24
#include <boost/unordered_map.hpp>
25
25
 
 
26
#include "drizzled/error_t.h"
26
27
#include "drizzled/definitions.h"
 
28
#include "drizzled/identifier.h"
27
29
 
28
30
namespace drizzled
29
31
{
77
79
                       const std::string& message);
78
80
#define DRIZZLE_ADD_ERROR_MESSAGE(code, msg) add_error_message(code, STRINGIFY_ARG(code), msg)
79
81
 
 
82
void my_error(drizzled_error_code nr, drizzled::Identifier::const_reference ref);
80
83
void my_error(drizzled_error_code nr);
81
 
void my_error(int nr, myf MyFlags, ...);
 
84
void my_error(drizzled_error_code nr, myf MyFlags, ...);
82
85
void my_message(uint32_t my_err, const char *str, myf MyFlags);
83
86
void my_printf_error(uint32_t my_err, const char *format,
84
87
                     myf MyFlags, ...)