Module: ppl/ppl Branch: termination Commit: b43d29400ddc9823f5d08d4148adb804dcc8e321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b43d29400ddc9...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sun Mar 21 07:32:40 2010 +0400

Fixed the ordering of exception handlers.

---

interfaces/OCaml/ppl_ocaml_common.defs.hh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index db969a8..7754c68 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -201,6 +201,10 @@ catch(std::overflow_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_arithmetic_overflow"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (const_cast<char*>(e.what()))); \ +} \ catch(std::runtime_error& e) { \ caml_raise_with_string(*caml_named_value("PPL_internal_error"), \ (const_cast<char*>(e.what()))); \ @@ -209,10 +213,6 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ -catch(std::logic_error& e) { \ - caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ - (const_cast<char*>(e.what()))); \ -} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \