[openrtm-commit:03190] r3230 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2018-02-27 10:15:00 +0900 (Tue, 27 Feb 2018)
New Revision: 3230

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SystemLogger.h
Log:
[incompat,->trunk] Incorrect loglevel documentation have been modified. Missing macro added. Unused macro deleted.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SystemLogger.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2018-02-27 01:10:30 UTC (rev 3229)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/SystemLogger.h	2018-02-27 01:15:00 UTC (rev 3230)
@@ -425,7 +425,7 @@
    * @brief ¥¨¥é¡¼¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£
    *
    * ¥¨¥é¡¼¥ì¥Ù¥ë¤Î¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£<BR>¥í¥°¥ì¥Ù¥ë¤¬
-   * ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID
+   * FATAL, ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
    * ¤Î¾ì¹ç¤Ë¥í¥°½ÐÎϤµ¤ì¤ë¡£
    *
    * @else
@@ -433,7 +433,7 @@
    * @brief Error log output macro
    *
    * This is a log output macro of the error level.
-   * If log levels are ERROR, WARN, INFO, NORMAL, DEBUG, TRACE,
+   * If log levels are FATAL, ERROR, WARN, INFO, NORMAL, DEBUG, TRACE,
    * VERBOSE or PARANOID, message will be output to log.
    *
    * @endif
@@ -447,7 +447,7 @@
    * @brief ¥¨¥é¡¼¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£
    *
    * ¥¨¥é¡¼¥ì¥Ù¥ë¤Î¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£<BR>¥í¥°¥ì¥Ù¥ë¤¬
-   * ERROR, WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID
+   * ERROR, WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID
    * ¤Î¾ì¹ç¤Ë¥í¥°½ÐÎϤµ¤ì¤ë¡£
    *
    * @else
@@ -455,8 +455,8 @@
    * @brief Error log output macro
    *
    * This is a log output macro of the error level.
-   * If log levels are ERROR, WARN, INFO, NORMAL, DEBUG, TRACE,
-   * VERBOSE or PARANOID, message will be output to log.
+   * If log levels are ERROR, WARN, INFO, DEBUG, TRACE,
+   * VERBOSE and PARANOID, message will be output to log.
    *
    * @endif
    */
@@ -469,7 +469,7 @@
    * @brief ¥ï¡¼¥Ë¥ó¥°¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£
    *
    * ¥ï¡¼¥Ë¥ó¥°¥ì¥Ù¥ë¤Î¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£<BR>¥í¥°¥ì¥Ù¥ë¤¬
-   * ( WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID )
+   * ( WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID )
    * ¤Î¾ì¹ç¤Ë¥í¥°½ÐÎϤµ¤ì¤ë¡£
    *
    * @else
@@ -477,7 +477,7 @@
    * @brief Warning log output macro
    *
    * If log levels are
-   * ( WARN, INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID ),
+   * ( WARN, INFO, DEBUG, TRACE, VERBOSE, PARANOID ),
    * message will be output to log.
    *
    * @endif
@@ -491,7 +491,7 @@
    * @brief ¥¤¥ó¥Õ¥©¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£
    *
    * ¥¤¥ó¥Õ¥©¥ì¥Ù¥ë¤Î¥í¥°½ÐÎÏ¥Þ¥¯¥í¡£<BR>¥í¥°¥ì¥Ù¥ë¤¬
-   * ( INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID )
+   * ( INFO, DEBUG, TRACE, VERBOSE, PARANOID )
    * ¤Î¾ì¹ç¤Ë¥í¥°½ÐÎϤµ¤ì¤ë¡£
    *
    * @else
@@ -499,7 +499,7 @@
    * @brief Information level log output macro
    *
    *  If log levels are
-   * ( INFO, NORMAL, DEBUG, TRACE, VERBOSE, PARANOID ),
+   * ( INFO, DEBUG, TRACE, VERBOSE, PARANOID ),
    * message will be output to log.
    *
    * @endif
@@ -597,12 +597,12 @@
 #define RTC_PARANOID_STR(str) RTC_LOG_STR(::RTC::Logger::RTL_PARANOID, str)
   
 #else
+#define RTC_FATAL(fmt)
+#define RTC_FATAL_STR(str)
 #define RTC_ERROR(fmt)
 #define RTC_ERROR_STR(str)
 #define RTC_WARN(fmt)
 #define RTC_WARN_STR(str)
-#define RTC_NORMAL(fmt)
-#define RTC_NORMAL_STR(str)
 #define RTC_INFO(fmt)
 #define RTC_INFO_STR(str)
 #define RTC_DEBUG(fmt)