]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
In the previous version it was impossible to use the "Assert"
authorkayser-herold <kayser-herold@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 4 Feb 2007 23:54:37 +0000 (23:54 +0000)
committerkayser-herold <kayser-herold@0785d39b-7218-0410-832d-ea1e28bc413d>
Sun, 4 Feb 2007 23:54:37 +0000 (23:54 +0000)
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

deal.II/base/include/base/exceptions.h

index e51ec736735ceb079cbcc13492308da98164de4e..eb278b549adc807931b34bcf0839e41946cc989c 100644 (file)
@@ -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
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.