c++14.patch

   1 diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp
   2 --- projectM-complete-2.1.0-Source/src/libprojectM/Common.hpp   2012-05-20 04:43:26.000000000 +0100
   3 +++ projectM-complete-2.1.0-Source.new/src/libprojectM/Common.hpp       2016-03-17 05:00:14.176905540 +0000
   4 @@ -63,7 +63,8 @@ extern FILE *fmemopen(void *buf, size_t
   5
   6  #ifdef LINUX
   7  #include <cstdlib>
   8 -#define projectM_isnan isnan
   9 +#include <cmath>
  10 +#define projectM_isnan std::isnan
  11
  12  #endif
  13
  14 diff -x '*orig' -rup projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp
  15 --- projectM-complete-2.1.0-Source/src/libprojectM/MilkdropPresetFactory/Parser.cpp     2012-05-20 04:43:26.000000000 +0100
  16 +++ projectM-complete-2.1.0-Source.new/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000
  17 @@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per
  18    PerFrameEqn * per_frame_eqn;
  19    GenExpr * gen_expr;
  20
  21 -  if (fs == NULL)
  22 +  if (!fs)
  23      return NULL;
  24    if (param_string == NULL)
  25      return NULL;
  26 @@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_
  27
  28    if (preset == NULL)
  29      return NULL;
  30 -  if (fs == NULL)
  31 +  if (!fs)
  32      return NULL;
  33
  34    if ((token = parseToken(fs, name)) != tEq)
  35 @@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token
  36    /* Null argument checks */
  37    if (preset == NULL)
  38      return PROJECTM_FAILURE;
  39 -  if (fs == NULL)
  40 +  if (!fs)
  41      return PROJECTM_FAILURE;
  42    if (token == NULL)
  43      return PROJECTM_FAILURE;
  44 @@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std
  45
  46    if (token == NULL)
  47      return PROJECTM_FAILURE;
  48 -  if (fs == NULL)
  49 +  if (!fs)
  50      return PROJECTM_FAILURE;
  51    if (preset == NULL)
  52      return PROJECTM_FAILURE;
  53 @@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st
  54    if (token == NULL)
  55
  56      return PROJECTM_FAILURE;
  57 -  if (fs == NULL)
  58 +  if (!fs)
  59      return PROJECTM_FAILURE;
  60    if (preset == NULL)
  61      return PROJECTM_FAILURE;