← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/utf8/checked.h

  • Committer: Monty Taylor
  • Date: 2010-10-08 21:03:33 UTC
  • mto: (1830.1.1 trunk-drizzle)
  • mto: This revision was merged to the branch mainline in revision 1831.
  • Revision ID: mordred@inaugust.com-20101008210333-dgvamr0t5w6w2ld1
Fixed a few compile errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/utf8/checked.h
44
44
    class invalid_code_point : public exception {
45
45
        uint32_t cp;
46
46
    public:
47
 
        invalid_code_point(uint32_t cp) : cp(cp) {}
 
47
        invalid_code_point(uint32_t cp_in) : cp(cp_in) {}
48
48
        virtual const char* what() const throw() { return "Invalid code point"; }
49
49
        uint32_t code_point() const {return cp;}
50
50
    };
271
271
      public:
272
272
      iterator () {};
273
273
      explicit iterator (const octet_iterator& octet_it,
274
 
                         const octet_iterator& range_start,
275
 
                         const octet_iterator& range_end) :
276
 
               it(octet_it), range_start(range_start), range_end(range_end)
 
274
                         const octet_iterator& range_start_in,
 
275
                         const octet_iterator& range_end_in) :
 
276
               it(octet_it), range_start(range_start_in), range_end(range_end_in)
277
277
      {
278
278
          if (it < range_start || it > range_end)
279
279
              throw std::out_of_range("Invalid utf-8 iterator position");