From 43a171512bfc93de4e8df55bfd33f4b4fce42f63 Mon Sep 17 00:00:00 2001 From: Michael Kuc Date: Thu, 14 May 2020 14:18:11 +0100 Subject: [PATCH] Revert "Revert "Fix deprecated comparison."" This reverts commit 0782489febc74838ef9118791e95e026ec97ed58. --- 3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp b/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp index fe26ced16..cdd06d1a1 100644 --- a/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp +++ b/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp @@ -1373,8 +1373,6 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std::istream & fs, char * pa PerFrameEqn * per_frame_eqn; GenExpr * gen_expr; - if (fs == NULL) - return NULL; if (param_string == NULL) return NULL; if (preset == NULL) @@ -1528,8 +1526,6 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream & fs, MilkdropPreset * if (preset == NULL) return NULL; - if (fs == NULL) - return NULL; if ((token = parseToken(fs, name)) != tEq) return NULL; @@ -1842,8 +1838,6 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p /* Null argument checks */ if (preset == NULL) return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; if (token == NULL) return PROJECTM_FAILURE; @@ -2133,8 +2127,6 @@ int Parser::parse_wave(char * token, std::istream & fs, MilkdropPreset * preset if (token == NULL) return PROJECTM_FAILURE; - if (fs == NULL) - return PROJECTM_FAILURE; if (preset == NULL) return PROJECTM_FAILURE; @@ -2314,8 +2306,6 @@ int Parser::parse_shape(char * token, std::istream & fs, MilkdropPreset * prese if (token == NULL) - return PROJECTM_FAILURE; - if (fs == NULL) return PROJECTM_FAILURE; if (preset == NULL) return PROJECTM_FAILURE;