Changeset 12506

Timestamp:

06/22/12 09:23:35 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixing _error2_ and PrintString macros (did not like std::ends)

File:

• issm/trunk-jpl/src/c/include/macros.h (modified) (4 diffs)

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

@@ -9 +9 @@
 #include <iostream>
 #include <sstream>
+#include <iomanip>
 #include "./typedefs.h"
 
@@ -20 +21 @@
 /* _printf_ {{{*/
 /*Printing macro: only cpu number 0 */
-#define _printf_(flag,...) do { if(flag) PrintfFunction(__VA_ARGS__); }while (0)
+#define _printf_(flag,...) do{if(flag) PrintfFunction(__VA_ARGS__);}while(0)
 /*}}}*/
 /* _error_ {{{*/
@@ -36 +37 @@
 #ifdef _INTEL_WIN_
 #define _error2_(StreamArgs)\
-   {std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+   do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}
+   throw ErrorException(aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 #else
 #define _error2_(StreamArgs)\
-        {std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
+        do{std::ostringstream aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy; \
    aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy << StreamArgs << std::ends; \
-   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}
+   throw ErrorException(__FILE__,__func__,__LINE__,aLoNgAnDwEiRdLoCaLnAmeFoRtHiSmAcRoOnLy.str());}while(0)
 #endif
 /*}}}*/
@@ -54 +55 @@
 /* macro to print some string, adds std::ends */
 #define _printString_(StreamArgs)\
-   {std::cout << StreamArgs << std::ends;}
+   {std::cout << StreamArgs;}
 /*}}}*/
 /* _assert_ {{{*/