From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 12 Mar 2013 17:53:44 +0000 (+0100)
Subject: Fix compiler warnings on Windows.
X-Git-Tag: v0.0.2~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c594ee7c30b1032e6b3e79feed8f4485ae53b780;p=icinga2

Fix compiler warnings on Windows.
---

diff --git a/lib/base/asynctask.h b/lib/base/asynctask.h
index 2b74d05dc..ca82d034e 100644
--- 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 f6d4a5c10..6ebf5234e 100644
--- 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 33ce4b77a..03262c951 100644
--- 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;
 	}
 }