← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/user_locks/locks.cc

  • Committer: Lee Bieber
  • Date: 2011-03-29 21:04:17 UTC
  • mfrom: (2253.1.2 trunk-gcc-4.6)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: kalebral@gmail.com-20110329210417-pqw4ll0hq5e32z9u
Merge Andrew - 743842: Build failure using GCC 4.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/user_locks/locks.cc
75
75
{
76
76
  boost::unique_lock<boost::mutex> scope(mutex);
77
77
  boost::system_time timeout= boost::get_system_time() + boost::posix_time::seconds(wait_for);
78
 
  bool timed_out;
79
78
 
80
79
  try {
81
 
    timed_out= create_cond.timed_wait(scope, timeout);
 
80
    create_cond.timed_wait(scope, timeout);
82
81
  }
83
82
  catch(boost::thread_interrupted const& error)
84
83
  {