← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/thr_alarm.cc

  • Committer: Brian Aker
  • Date: 2009-02-08 22:14:20 UTC
  • mfrom: (854.1.1 devel)
  • Revision ID: brian@tangent.org-20090208221420-v1xc9wqzdjzv3qsl
Solaris fix from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/thr_alarm.cc
373
373
  {
374
374
    if (alarm_aborted)
375
375
    {
376
 
      alarm_stack.erase(remove_if(alarm_stack.begin(),alarm_stack.end(),
 
376
      alarm_stack.erase(std::remove_if(alarm_stack.begin(),alarm_stack.end(),
377
377
                        alarm_if()),alarm_stack.end());
378
378
 
379
379
#ifndef USE_ALARM_THREAD
386
386
      time_t now= time(NULL);
387
387
      time_t next= now+10-(now%10);
388
388
 
389
 
      alarm_stack.erase(remove_if(alarm_stack.begin(),alarm_stack.end(),
 
389
      alarm_stack.erase(std::remove_if(alarm_stack.begin(),alarm_stack.end(),
390
390
                        alarm_if_time(now, next)),alarm_stack.end());
391
391
#ifndef USE_ALARM_THREAD
392
392
      if (alarm_stack.size())