Changeset 13035

Timestamp:

08/14/12 16:54:57 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of _error_, only use _error2_

Location:

issm/trunk-jpl/src/c

Files:

• include/macros.h (modified) (2 diffs)
• shared/Sys/ProfilingEnd.cpp (modified) (1 diff)
• shared/Sys/ProfilingStart.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/include/macros.h

@@ -22 +22 @@
 /*Printing macro: only cpu number 0 */
 #define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0)
-/*}}}*/
-/* _error_ {{{*/
-/*Error exception macro*/
-#ifdef _INTEL_WIN_
-#define _error_(...)\
-  throw ErrorException(exprintf(__VA_ARGS__))
-#else
-#define _error_(...)\
-  throw ErrorException(__FILE__,__func__,__LINE__,exprintf(__VA_ARGS__))
-#endif
 /*}}}*/
 /* _error2_ {{{*/
@@ -75 +65 @@
 #ifdef _ISSM_DEBUG_ 
 #define _assert_(statement)\
-  if (!(statement)) _error_("Assertion \"%s\" failed, please report bug to %s",#statement,PACKAGE_BUGREPORT)
+  if (!(statement)) _error2_("Assertion \""<<#statement<<"\" failed, please report bug to "<<PACKAGE_BUGREPORT)
 #else
 #define _assert_(ignore)\

issm/trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp

@@ -30 +30 @@
         _pprintLine_("PETSc memory used   : " << memUse << "  Bytes");
         #else
-                _error_("Profiling not supported under this numerical toolkit");
+                _error2_("Profiling not supported under this numerical toolkit");
         #endif
 

issm/trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp

@@ -23 +23 @@
                 PetscGetFlops(&Flops_start );
         #else
-                _error_("Profiling not supported under this numerical toolkit");
+                _error2_("Profiling not supported under this numerical toolkit");
         #endif