]> granicus.if.org Git - icinga2/commitdiff
Fix some compile warnings
authorGunnar Beutner <gunnar@beutner.name>
Wed, 4 Mar 2015 07:26:15 +0000 (08:26 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Wed, 4 Mar 2015 07:26:15 +0000 (08:26 +0100)
lib/config/expression.cpp
lib/db_ido_mysql/idomysqlconnection.cpp
lib/db_ido_pgsql/idopgsqlconnection.cpp

index 8a8eec0ed422908f0db77f68abfe0436be664840..6e8b182033988fe24140c64e38f97707043b6531 100644 (file)
@@ -463,7 +463,7 @@ ExpressionResult GetScopeExpression::DoEvaluate(ScriptFrame& frame, DebugHint *d
        else if (m_ScopeSpec == ScopeGlobal)
                return ScriptGlobal::GetGlobals();
        else
-               ASSERT(!"Invalid scope.");
+               VERIFY(!"Invalid scope.");
 }
 
 ExpressionResult SetExpression::DoEvaluate(ScriptFrame& frame, DebugHint *dhint) const
index aa7a7bb8cf598b79f15c96efe2b3bd324bd94039..9906de942340a80fb59789be890954d8f0dfb578 100644 (file)
@@ -661,7 +661,7 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                        qbuf << "DELETE FROM " << GetTablePrefix() << query.Table;
                        break;
                default:
-                       ASSERT(!"Invalid query type.");
+                       VERIFY(!"Invalid query type.");
        }
 
        if (type == DbQueryInsert || type == DbQueryUpdate) {
index a8debf876f00970424e5ac916d534aa17260ec6f..fa9b935cf01dc29822e1fcf6e5e7f9cbb97614c3 100644 (file)
@@ -638,7 +638,7 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                else if (query.StatusUpdate)
                        hasid = GetStatusUpdate(query.Object);
                else
-                       ASSERT(!"Invalid query flags.");
+                       VERIFY(!"Invalid query flags.");
 
                if (!hasid)
                        upsert = true;
@@ -657,7 +657,7 @@ void IdoPgsqlConnection::InternalExecuteQuery(const DbQuery& query, DbQueryType
                        qbuf << "DELETE FROM " << GetTablePrefix() << query.Table;
                        break;
                default:
-                       ASSERT(!"Invalid query type.");
+                       VERIFY(!"Invalid query type.");
        }
 
        if (type == DbQueryInsert || type == DbQueryUpdate) {