diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
| commit | 4ba8772aef261da209bbb882325fd61a8b479fd7 (patch) | |
| tree | 7fe9e3976d52503b474cfa96716c1bd4535b8f8d /src/lib/exceptions.h | |
| parent | b299c1873bf23414061d551843275c77a9256a05 (diff) | |
| parent | eec6f90d8e2c2246ce674ae13e4f460b12a4f2a9 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/exceptions.h')
| -rw-r--r-- | src/lib/exceptions.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h index 61163c8d1..213be6186 100644 --- a/src/lib/exceptions.h +++ b/src/lib/exceptions.h @@ -260,6 +260,7 @@ public: boost::mutex::scoped_lock lm (_mutex); if (_exception) { boost::rethrow_exception (_exception); + _exception = boost::exception_ptr (); } } |