Register the functions that intercept the warnings and info message

only when the user actually wants to announce them.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@65 83718e91-0e4f-0410-abf4-91180603181f

1 files changed, 24 insertions, 12 deletions

diff --git a/src/announce.cc b/src/announce.cc
index f914263..e7ca287 100644
--- a/src/announce.cc
+++ b/src/announce.cc
@@ -901,13 +901,19 @@ namespace Formaline
     DECLARE_CCTK_ARGUMENTS;
     DECLARE_CCTK_PARAMETERS;
 
-    int const ierr1
-      = CCTK_WarnCallbackRegister (0, max_warn_level, cctkGH, CatchWarning);
-    assert (! ierr1);
+    if (max_warn_level >= 0)
+    {
+      int const ierr1
+        = CCTK_WarnCallbackRegister (0, max_warn_level, cctkGH, CatchWarning);
+      assert (! ierr1);
+    }
 
-    int const ierr2
-      = CCTK_InfoCallbackRegister (cctkGH, CatchInfo);
-    assert (! ierr2);
+    if (output_info)
+    {
+      int const ierr2
+        = CCTK_InfoCallbackRegister (cctkGH, CatchInfo);
+      assert (! ierr2);
+    }
   }
 
 #else
@@ -918,13 +924,19 @@ namespace Formaline
   {
     DECLARE_CCTK_PARAMETERS;
 
-    int const ierr1
-      = CCTK_WarnCallbackRegister (0, max_warn_level, 0, CatchWarning);
-    assert (! ierr1);
+    if (max_warn_level >= 0)
+    {
+      int const ierr1
+        = CCTK_WarnCallbackRegister (0, max_warn_level, 0, CatchWarning);
+      assert (! ierr1);
+    }
 
-    int const ierr2
-      = CCTK_InfoCallbackRegister (0, CatchInfo);
-    assert (! ierr2);
+    if (output_info)
+    {
+      int const ierr2
+        = CCTK_InfoCallbackRegister (0, CatchInfo);
+      assert (! ierr2);
+    }
 
     return 0;
   }