[Getfem-commits] (no subject)

[Roman Putanowicz]

branch: devel-rppplx-external-except
commit 98b394e126ca8999baa88c83178b03b3600ef6b2
Author: rpplx <address@hidden>
Date:   Wed Jul 12 22:54:18 2017 +0200

    The structures and functions to manage traces level and warning levels has 
been moved from gmm_except.h to gmm_feedback_management.h
    Then the later header has been included in gmm_except.h
---
 src/gmm/gmm_except.h              | 19 ++-----------------
 src/gmm/gmm_feedback_management.h | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/gmm/gmm_except.h b/src/gmm/gmm_except.h
index 65084cf..0e8b46d 100644
--- a/src/gmm/gmm_except.h
+++ b/src/gmm/gmm_except.h
@@ -40,6 +40,8 @@
 #define GMM_EXCEPT_H__
 
 #include "gmm_std.h"
+#include "gmm_feedback_management.h"
+
 
 //provides external implementation of gmm_exception and logging.
 #ifndef EXTERNAL_EXCEPT_
@@ -175,15 +177,6 @@ namespace gmm {
 /*   GetFEM++ warnings.                                                    */
 /* *********************************************************************** */
 
-  // This allows to dynamically hide warnings
-  struct warning_level {
-    static int level(int l = -2)
-    { static int level_ = 3; return (l != -2) ? (level_ = l) : level_; }
-  };
-
-  inline void set_warning_level(int l) { warning_level::level(std::max(0,l)); }
-  inline int  get_warning_level(void)  { return warning_level::level(-2); }
-
   // This allows not to compile some Warnings
 #ifndef GMM_WARNING_LEVEL
 # define GMM_WARNING_LEVEL 4
@@ -236,14 +229,6 @@ namespace gmm {
 /*     GetFEM++ traces.                                                    */
 /* *********************************************************************** */
 
-  // This allows to dynamically hide traces
-  struct traces_level {
-    static int level(int l = -2)
-    { static int level_ = 3; return (l != -2) ? (level_ = l) : level_; }
-  };
-
-  inline void set_traces_level(int l) { traces_level::level(std::max(0,l)); }
-
   // This allow not too compile some Warnings
 #ifndef GMM_TRACES_LEVEL
 # define GMM_TRACES_LEVEL 4
diff --git a/src/gmm/gmm_feedback_management.h 
b/src/gmm/gmm_feedback_management.h
index d0e4d8d..3c277b9 100644
--- a/src/gmm/gmm_feedback_management.h
+++ b/src/gmm/gmm_feedback_management.h
@@ -44,6 +44,33 @@
 namespace gmm {
 
 /* *********************************************************************** */
+/*     GetFEM++ warnings.                                                 */
+/* *********************************************************************** */
+
+// This allows to dynamically hide warnings
+struct warning_level {
+  static int level(int l = -2)
+  { static int level_ = 3; return (l != -2) ? (level_ = l) : level_; }
+};
+
+inline void set_warning_level(int l) { warning_level::level(l>0 ? l : 0); }
+inline int  get_warning_level(void)  { return warning_level::level(-2); }
+
+/* *********************************************************************** */
+/*     GetFEM++ traces.                                                   */
+/* *********************************************************************** */
+
+// This allows to dynamically hide traces
+struct traces_level {
+  static int level(int l = -2)
+  { static int level_ = 3; return (l != -2) ? (level_ = l) : level_; }
+};
+
+inline void set_traces_level(int l) { traces_level::level(l>0 ? l : 0); }
+inline int  get_traces_level(void)  { return traces_level::level(); }
+
+
+/* *********************************************************************** */
 /*     GetFEM++ feedback management                                       */
 /* *********************************************************************** */