Ticket #7045: 7045.patch
File 7045.patch, 3.4 KB (added by , 10 years ago) |
---|
-
win32/condition_variable.hpp
314 314 } 315 315 316 316 317 bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until)317 bool timed_wait(unique_lock<mutex>& m,boost::system_time const& p_wait_until) 318 318 { 319 return do_wait(m, wait_until);319 return do_wait(m,p_wait_until); 320 320 } 321 321 322 bool timed_wait(unique_lock<mutex>& m,boost::xtime const& wait_until)322 bool timed_wait(unique_lock<mutex>& m,boost::xtime const& p_wait_until) 323 323 { 324 return do_wait(m,system_time( wait_until));324 return do_wait(m,system_time(p_wait_until)); 325 325 } 326 326 template<typename duration_type> 327 327 bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration) … … 330 330 } 331 331 332 332 template<typename predicate_type> 333 bool timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until,predicate_type pred)333 bool timed_wait(unique_lock<mutex>& m,boost::system_time const& p_wait_until,predicate_type pred) 334 334 { 335 return do_wait(m, wait_until,pred);335 return do_wait(m,p_wait_until,pred); 336 336 } 337 337 template<typename predicate_type> 338 bool timed_wait(unique_lock<mutex>& m,boost::xtime const& wait_until,predicate_type pred)338 bool timed_wait(unique_lock<mutex>& m,boost::xtime const& p_wait_until,predicate_type pred) 339 339 { 340 return do_wait(m,system_time( wait_until),pred);340 return do_wait(m,system_time(p_wait_until),pred); 341 341 } 342 342 template<typename duration_type,typename predicate_type> 343 343 bool timed_wait(unique_lock<mutex>& m,duration_type const& wait_duration,predicate_type pred) … … 422 422 } 423 423 424 424 template<typename lock_type> 425 bool timed_wait(lock_type& m,boost::system_time const& wait_until)425 bool timed_wait(lock_type& m,boost::system_time const& p_wait_until) 426 426 { 427 return do_wait(m, wait_until);427 return do_wait(m,p_wait_until); 428 428 } 429 429 430 430 template<typename lock_type> 431 bool timed_wait(lock_type& m,boost::xtime const& wait_until)431 bool timed_wait(lock_type& m,boost::xtime const& p_wait_until) 432 432 { 433 return do_wait(m,system_time( wait_until));433 return do_wait(m,system_time(p_wait_until)); 434 434 } 435 435 436 436 template<typename lock_type,typename duration_type> … … 440 440 } 441 441 442 442 template<typename lock_type,typename predicate_type> 443 bool timed_wait(lock_type& m,boost::system_time const& wait_until,predicate_type pred)443 bool timed_wait(lock_type& m,boost::system_time const& p_wait_until,predicate_type pred) 444 444 { 445 return do_wait(m, wait_until,pred);445 return do_wait(m,p_wait_until,pred); 446 446 } 447 447 448 448 template<typename lock_type,typename predicate_type> 449 bool timed_wait(lock_type& m,boost::xtime const& wait_until,predicate_type pred)449 bool timed_wait(lock_type& m,boost::xtime const& p_wait_until,predicate_type pred) 450 450 { 451 return do_wait(m,system_time( wait_until),pred);451 return do_wait(m,system_time(p_wait_until),pred); 452 452 } 453 453 454 454 template<typename lock_type,typename duration_type,typename predicate_type>