← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/barrier.h

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/barrier.h
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