Fix compiler warnings on Windows.

diff --git a/lib/base/asynctask.h b/lib/base/asynctask.h
index 2b74d05dc8646a11aca062ce4b45449f879618ce..ca82d034e81f23fc71a88138f95f258b25644b8c 100644 (file)
--- a/lib/base/asynctask.h
+++ b/lib/base/asynctask.h
@@ -52,10 +52,8 @@ public:
         */
        ~AsyncTask(void)
        {
-               if (!m_Finished)
-                       ASSERT(!"Contract violation: AsyncTask was destroyed before its completion callback was invoked.");
-               else if (!m_ResultRetrieved)
-                       ASSERT(!"Contract violation: AsyncTask was destroyed before its result was retrieved.");
+               ASSERT(m_Finished);
+               ASSERT(m_ResultRetrieved);
        }
 
 

diff --git a/lib/base/sysloglogger.cpp b/lib/base/sysloglogger.cpp
index f6d4a5c106418b77a5e2e6193ec42bb7a916a000..6ebf5234e7fcd24bec44cc7fde2a9a01c339693c 100644 (file)
--- a/lib/base/sysloglogger.cpp
+++ b/lib/base/sysloglogger.cpp
@@ -35,17 +35,16 @@ void SyslogLogger::ProcessLogEntry(const LogEntry& entry)
                case LogDebug:
                        severity = LOG_DEBUG;
                        break;
-               case LogInformation:
-                       severity = LOG_INFO;
-                       break;
                case LogWarning:
                        severity = LOG_WARNING;
                        break;
                case LogCritical:
                        severity = LOG_CRIT;
                        break;
+               case LogInformation:
                default:
-                       ASSERT(!"Invalid severity specified.");
+                       severity = LOG_INFO;
+                       break;
        }
 
        syslog(severity | LOG_USER, "%s", entry.Message.CStr());

diff --git a/lib/config/typerule.cpp b/lib/config/typerule.cpp
index 33ce4b77a304692fd910524b113e2fe66fbc3c9e..03262c951316fdd764c0296f5385bac2ad0bf9fe 100644 (file)
--- a/lib/config/typerule.cpp
+++ b/lib/config/typerule.cpp
@@ -63,8 +63,6 @@ bool TypeRule::MatchValue(const Value& value) const
                        return value.IsObjectType<Dictionary>();
 
                default:
-                       ASSERT(!"Type rule has invalid type specifier.");
-
                        return false;
        }
 }