[Libreoffice-commits] online.git: loolwsd/Log.hpp

[Ashod Nakashian]

 loolwsd/Log.hpp |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit b9b69e9534ff9e8521d77f206c7d960580b25c3a
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Thu Nov 3 20:27:28 2016 -0400

    loolwsd: rename LOG_XXX internal variable to minimize conflicts
    
    Change-Id: I82e98b38a0ac6a5e821148f213aa1b15827e23df
    Reviewed-on: https://gerrit.libreoffice.org/30548
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/Log.hpp b/loolwsd/Log.hpp
index 64634c7..f52973a 100644
--- a/loolwsd/Log.hpp
+++ b/loolwsd/Log.hpp
@@ -170,13 +170,13 @@ namespace Log
     }
 }
 
-#define LOG_BODY(LVL, X) std::ostringstream oss; oss << Log::prefix("TRC") << 
X << "| " << __FILE__ << ':' << __LINE__
-#define LOG_TRC(X) if (Log::traceEnabled()) { LOG_BODY("TRC", X); 
Log::logger().trace(oss.str()); }
-#define LOG_DBG(X) if (Log::debugEnabled()) { LOG_BODY("DBG", X); 
Log::logger().debug(oss.str()); }
-#define LOG_INF(X) if (Log::infoEnabled()) { LOG_BODY("INF", X); 
Log::logger().information(oss.str()); }
-#define LOG_WRN(X) if (Log::warnEnabled()) { LOG_BODY("WRN", X); 
Log::logger().warning(oss.str()); }
-#define LOG_ERR(X) if (Log::errorEnabled()) { LOG_BODY("ERR", X); 
Log::logger().error(oss.str()); }
-#define LOG_FTL(X) if (Log::fatalEnabled()) { LOG_BODY("FTL", X); 
Log::logger().fatal(oss.str()); }
+#define LOG_BODY(LVL, X) std::ostringstream oss_; oss_ << Log::prefix("TRC") 
<< X << "| " << __FILE__ << ':' << __LINE__
+#define LOG_TRC(X) if (Log::traceEnabled()) { LOG_BODY("TRC", X); 
Log::logger().trace(oss_.str()); }
+#define LOG_DBG(X) if (Log::debugEnabled()) { LOG_BODY("DBG", X); 
Log::logger().debug(oss_.str()); }
+#define LOG_INF(X) if (Log::infoEnabled()) { LOG_BODY("INF", X); 
Log::logger().information(oss_.str()); }
+#define LOG_WRN(X) if (Log::warnEnabled()) { LOG_BODY("WRN", X); 
Log::logger().warning(oss_.str()); }
+#define LOG_ERR(X) if (Log::errorEnabled()) { LOG_BODY("ERR", X); 
Log::logger().error(oss_.str()); }
+#define LOG_FTL(X) if (Log::fatalEnabled()) { LOG_BODY("FTL", X); 
Log::logger().fatal(oss_.str()); }
 
 #endif
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits