~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/barrier.h

  • Committer: Lee Bieber
  • Date: 2011-02-09 15:43:21 UTC
  • mfrom: (2151.1.3 build)
  • Revision ID: kalebral@gmail.com-20110209154321-bqrvjfgh4f6o3hm6
Merge Lee - update valgrind suppressions on 32bit machines
Merge Olaf - macro functions should be c++ template functions
Merge Lee - 714638: [user_locks plugin] Compilation aborts on FreeBSD 8.1 after complaining about overloaded abs function

Show diffs side-by-side

added added

removed removed

Lines of Context:
245
245
    {
246
246
      return limit - current_wait;
247
247
    }
248
 
    return std::abs(current_wait);
 
248
    return std::abs(static_cast<long int>(current_wait));
249
249
  }
250
250
 
251
251