← Back to branch summary

~brianaker/drizzle/warning-cleanup

« back to all changes in this revision

Viewing changes to client/drizzleslap.cc

  • Committer: Continuous Integration
  • Date: 2012-12-14 11:21:11 UTC
  • mfrom: (2604.1.3 trunk)
  • Revision ID: ci@drizzle.org-20121214112111-hegy0dv5scyhu561
Merge lp:~brianaker/drizzle/boost_update_time/ Build: jenkins-Drizzle-Builder-117

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzleslap.cc
1934
1934
    boost::mutex::scoped_lock scopedLock(timer_alarm_mutex);
1935
1935
 
1936
1936
    boost::xtime xt; 
1937
 
    xtime_get(&xt, boost::TIME_UTC); 
 
1937
#if BOOST_VERSION >= 105000
 
1938
    xtime_get(&xt, boost::TIME_UTC_);
 
1939
#else
 
1940
    xtime_get(&xt, boost::TIME_UTC);
 
1941
#endif
1938
1942
    xt.sec += opt_timer_length; 
1939
1943
 
1940
1944
    (void)timer_alarm_threshold.timed_wait(scopedLock, xt);