Changeset 27035 for issm/trunk/src/c/shared/Exceptions/exceptions.h

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/shared/Exceptions/exceptions.h (modified) (4 diffs)

issm/trunk/src/c/shared/Exceptions/exceptions.h

@@ -28 +28 @@
 #include <sstream>
 
-/*macros: */
+/*macros: (should move somewhere else)*/
+#include "../io/Comm/IssmComm.h"
 /* _assert_ {{{*/
 /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
@@ -50 +51 @@
         do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
+   throw ErrorException(IssmComm::GetRank(),__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 #endif
 /*}}}*/
@@ -78 +79 @@
 
 /*ISSM exception class: */
-class ErrorException: public exception { /*{{{*/
+class ErrorException: public exception{ /*{{{*/
 
         char* what_str;
@@ -84 +85 @@
         char* file_name;
         int   file_line;
+        int   rank;
 
         public:
-        ErrorException(const string &what_arg); //for windows
-        ErrorException(const string &what_file,const string& what_function,int what_line,const string& what_arg);//UNIX
+        /*Windows*/
+        ErrorException(const string &what_arg);
+        /*Linux/macOS*/
+        ErrorException(int what_rank,const string &what_file,const string& what_function,int what_line,const string& what_arg);
         ~ErrorException() throw();
         virtual const char *what() const throw();