Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h	(revision 13034)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/include/macros.h	(revision 13035)
@@ -22,16 +22,6 @@
 /*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_ {{{*/
 /*new Error exception macro*/
 #ifdef _INTEL_WIN_
@@ -74,7 +64,7 @@
 /*Assertion macro: do nothing if macro _ISSM_DEBUG_ undefined*/
 #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)\
   ((void) 0)
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp	(revision 13034)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingEnd.cpp	(revision 13035)
@@ -29,7 +29,7 @@
 	_pprintLine_("PETSc elapsed flops : " << Current_flops << "  Flops");
 	_pprintLine_("PETSc memory used   : " << memUse << "  Bytes");
 	#else
-		_error_("Profiling not supported under this numerical toolkit");
+		_error2_("Profiling not supported under this numerical toolkit");
 	#endif
 
 	/*Assign pointers: */
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp	(revision 13034)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Sys/ProfilingStart.cpp	(revision 13035)
@@ -22,7 +22,7 @@
 		PetscGetTime(&Time_start);
 		PetscGetFlops(&Flops_start );
 	#else
-		_error_("Profiling not supported under this numerical toolkit");
+		_error2_("Profiling not supported under this numerical toolkit");
 	#endif
 
 	/*Assign pointers: */