← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Monty
  • Date: 2008-10-02 05:41:33 UTC
  • mfrom: (398.1.10 codestyle)
  • Revision ID: mordred@scylla.inaugust.com-20081002054133-tyxv5bmqpazfaqqi
Merged up to 408 of stdint-includes-fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
1424
1424
      For when the enum is made to contain 64 elements, as 1ULL<<64 is
1425
1425
      undefined, we guard with a "count<64" test.
1426
1426
    */
1427
 
    if (unlikely((tmp >= ((1ULL) << enum_names->count)) &&
 
1427
    if (unlikely((tmp >= ((1UL) << enum_names->count)) &&
1428
1428
                 (enum_names->count < 64)))
1429
1429
    {
1430
1430
      llstr(tmp, buff);