From: kayser-herold Date: Sun, 4 Feb 2007 23:54:37 +0000 (+0000) Subject: In the previous version it was impossible to use the "Assert" X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f28c01cec995a49308c4caeaae2da96fd23841c;p=dealii-svn.git In the previous version it was impossible to use the "Assert" macros, if the dealii namespace was not globally included. This is now fixed. git-svn-id: https://svn.dealii.org/trunk@14404 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/exceptions.h b/deal.II/base/include/base/exceptions.h index e51ec73673..eb278b549a 100644 --- a/deal.II/base/include/base/exceptions.h +++ b/deal.II/base/include/base/exceptions.h @@ -358,7 +358,7 @@ namespace deal_II_exceptions #define Assert(cond, exc) \ { \ if (!(cond)) \ - deal_II_exceptions::internals:: \ + ::dealii::deal_II_exceptions::internals:: \ issue_error_assert_1 (__FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, #cond, #exc, exc);\ @@ -399,7 +399,7 @@ namespace deal_II_exceptions # define AssertThrow(cond, exc) \ { \ if (!(cond)) \ - deal_II_exceptions::internals:: \ + ::dealii::deal_II_exceptions::internals:: \ issue_error_throw (__FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, #cond, #exc, exc); \ @@ -408,7 +408,7 @@ namespace deal_II_exceptions # define AssertThrow(cond, exc) \ { \ if (__builtin_expect(!(cond), false)) \ - deal_II_exceptions::internals:: \ + ::dealii::deal_II_exceptions::internals:: \ issue_error_throw (__FILE__, \ __LINE__, \ __PRETTY_FUNCTION__, #cond, #exc, exc); \ @@ -418,7 +418,7 @@ namespace deal_II_exceptions # define AssertThrow(cond, exc) \ { \ if (!(cond)) \ - deal_II_exceptions::internals::abort (); \ + ::dealii::deal_II_exceptions::internals::abort (); \ } #endif