Changeset 19701

Timestamp:

11/09/15 17:53:05 (9 years ago)

Author:

Eric.Larour

Message:

CHG: no need for differentiated report functions!

Location:

issm/trunk-jpl/src

Files:

• c/shared/Exceptions/Exceptions.cpp (modified) (2 diffs)
• c/shared/Exceptions/exceptions.h (modified) (1 diff)
• wrappers/matlab/include/wrapper_macros.h (modified) (1 diff)
• wrappers/python/include/wrapper_macros.h (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

@@ -80 +80 @@
         return;
 }/*}}}*/
-const char* ErrorException::MatlabReport() const{/*{{{*/
+const char* ErrorException::WrapperReport() const{/*{{{*/
 
         /*Output*/
@@ -100 +100 @@
         return message;
 }/*}}}*/
-const char* ErrorException::PythonReport() const{/*{{{*/
-
-        /*Output*/
-        std::ostringstream buffer;
-        char *message = NULL;
-
-        /*WINDOWS*/
-        if(!function_name || file_line==0){ 
-                buffer << " error message: " << this->what_str;
-        }
-        else{
-                buffer << "\nError in ==> " << this->file_name << ":" << file_line << "\n";
-                buffer << this->function_name << " error message: " << this->what_str;
-        }
-
-        /*Convert std::ostringstream to std::string and then create char* */
-        std::string buffer2 = buffer.str();
-        message = xNew<char>(strlen(buffer2.c_str())+1); sprintf(message,"%s",buffer2.c_str());
-        return message;
-}/*}}}*/

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

@@ -87 +87 @@
         virtual const char *what() const throw();
         void Report() const;
-        const char* MatlabReport() const;
-        const char* PythonReport() const;
+        const char* WrapperReport() const;
 
 };

issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h

@@ -23 +23 @@
 #define MODULEEND(); }\
         catch(ErrorException &exception){\
-                mexErrMsgTxt(exception.MatlabReport()); \
+                mexErrMsgTxt(exception.WrapperReport()); \
         }\
         catch (exception &e){\

issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h

@@ -27 +27 @@
 #define MODULEEND(); }\
   catch(ErrorException &exception){\
-          PyErr_SetString(PyExc_TypeError,exception.PythonReport()); \
+          PyErr_SetString(PyExc_TypeError,exception.WrapperReport()); \
           return NULL;\
   } \