Changeset 242 in pacpusframework for trunk

Timestamp:

Dec 2, 2013, 9:25:38 AM (11 years ago)

Author:

Marek Kurdej

Message:

Minor: refactored code in ColorSeverityFormatter.hpp

File:

• trunk/src/PacpusLib/ColorSeverityFormatter.hpp (modified) (2 diffs)

trunk/src/PacpusLib/ColorSeverityFormatter.hpp

@@ -88 +88 @@
 }
 
-template < typename CharT >
-struct ColorFormatter
-{
-    ColorFormatter()
-        : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
-    {
-    }
-
-    void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& sev)
-    {
-        // Gets the current text color.
-        CONSOLE_SCREEN_BUFFER_INFO bufferInfo;
-        GetConsoleScreenBufferInfo(mStreamHandle, &bufferInfo);
-        mSavedConsoleBufferInfo = bufferInfo.wAttributes;
-
-        // We need to flush the stream buffers into the console before each
-        // SetConsoleTextAttribute call lest it affect the text that is already
-        // printed but has not yet reached the console.
-        fflush(stdout);
-        SetConsoleTextAttribute(mStreamHandle, getColorAttribute(getColor(sev)) | FOREGROUND_INTENSITY);
-    }
-
-    const HANDLE mStreamHandle;
-    WORD mSavedConsoleBufferInfo;
-};
-
-template < typename CharT >
-struct DefaultFormatter
-{
-    DefaultFormatter() //(WORD savedConsoleBufferInfo)
-        : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
-        //, mSavedConsoleBufferInfo(savedConsoleBufferInfo)
-        , mSavedConsoleBufferInfo(getColorAttribute(COLOR_WHITE) | FOREGROUND_INTENSITY) // FIXME: restore old value, not just reset
-    {
-    }
-
-    void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& /*sev*/)
-    {
-        fflush(stdout);
-        // Restores the text color.
-        SetConsoleTextAttribute(mStreamHandle, mSavedConsoleBufferInfo);
-    }
-
-    const HANDLE mStreamHandle;
-    WORD mSavedConsoleBufferInfo;
-};
-
 #else
 
@@ -175 +128 @@
 }
 
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+
 template < typename CharT >
 struct ColorFormatter
 {
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    ColorFormatter()
+        : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
+    {
+    }
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+
     void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& sev)
     {
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+        // Gets the current text color.
+        CONSOLE_SCREEN_BUFFER_INFO bufferInfo;
+        GetConsoleScreenBufferInfo(mStreamHandle, &bufferInfo);
+        mSavedConsoleBufferInfo = bufferInfo.wAttributes;
+
+        // We need to flush the stream buffers into the console before each
+        // SetConsoleTextAttribute call lest it affect the text that is already
+        // printed but has not yet reached the console.
+        fflush(stdout);
+        SetConsoleTextAttribute(mStreamHandle, getColorAttribute(getColor(sev)) | FOREGROUND_INTENSITY);
+#else
         strm << getAnsiColorCode(getColor(sev)).c_str();
-    }
-};
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    }
+
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    const HANDLE mStreamHandle;
+    WORD mSavedConsoleBufferInfo;
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+};
+
 template < typename CharT >
 struct DefaultFormatter
 {
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    DefaultFormatter() //(WORD savedConsoleBufferInfo)
+        : mStreamHandle(GetStdHandle(STD_OUTPUT_HANDLE))
+        //, mSavedConsoleBufferInfo(savedConsoleBufferInfo)
+        , mSavedConsoleBufferInfo(getColorAttribute(COLOR_WHITE) | FOREGROUND_INTENSITY) // FIXME: restore old value, not just reset
+    {
+    }
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+
     void operator()(boost::log::basic_formatting_ostream<CharT>& strm, SeverityLevel const& /*sev*/)
     {
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+        fflush(stdout);
+        // Restores the text color.
+        SetConsoleTextAttribute(mStreamHandle, mSavedConsoleBufferInfo);
+#else
         strm << getAnsiColorCodeRestoreDefault().c_str();
-    }
-};
-
-#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    }
+
+#if defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+    const HANDLE mStreamHandle;
+    WORD mSavedConsoleBufferInfo;
+#endif // defined(PACPUS_OS_WINDOWS) && !defined(PACPUS_OS_WINDOWS_MOBILE)
+};
 
 template< typename T, typename FallbackPolicyT, typename CharT >