← Back to branch summary

~yshurik/libmemcached/libmemcached-win

« back to all changes in this revision

Viewing changes to libtest/collection.cc

  • Committer: Continuous Integration
  • Date: 2013-06-14 17:10:51 UTC
  • mfrom: (1104.1.7 libmemcached)
  • Revision ID: ci@tangent.org-20130614171051-3bz9urmntb38uaou
Merge lp:~brianaker/libmemcached/update-1.2 Build: jenkins-Libmemcached-312

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtest/collection.cc
60
60
  // system.
61
61
  catch (const libtest::fatal& e)
62
62
  {
 
63
    alarm(0);
63
64
    if (libtest::fatal::is_disabled())
64
65
    {
65
66
      libtest::fatal::increment_disabled_counter();
70
71
      throw;
71
72
    }
72
73
  }
 
74
  catch (...)
 
75
  {
 
76
    alarm(0);
 
77
    throw;
 
78
  }
73
79
 
74
80
  _timer.sample();
75
81