From 1ae1312c7258023f5c640c9a6a285909d49c32f5 Mon Sep 17 00:00:00 2001
From: "Christian R. Helmrich" <c.helmrich@ecodis.de>
Date: Sun, 12 Apr 2020 02:00:03 +0200
Subject: [PATCH] fix for gcc <= 5.5

---
 src/app/exhaleApp.cpp | 8 ++++----
 src/lib/exhaleEnc.cpp | 2 +-
 src/makefile.base     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/exhaleApp.cpp b/src/app/exhaleApp.cpp
index 94091ee..482e794 100644
--- a/src/app/exhaleApp.cpp
+++ b/src/app/exhaleApp.cpp
@@ -448,7 +448,7 @@ int main (const int argc, char* argv[])
       }
       if (bwMax < bw) bwMax = bw;
       // write first AU, add frame to header
-      if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength))
+      if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
       {
 #if USE_EXHALELIB_DLL
         exhaleDelete (&exhaleEnc);
@@ -471,7 +471,7 @@ int main (const int argc, char* argv[])
         }
         if (bwMax < bw) bwMax = bw;
         // write new AU, add frame to header
-        if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength))
+        if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
         {
 #if USE_EXHALELIB_DLL
           exhaleDelete (&exhaleEnc);
@@ -501,7 +501,7 @@ int main (const int argc, char* argv[])
       }
       if (bwMax < bw) bwMax = bw;
       // write final AU, add frame to header
-      if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength))
+      if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
       {
 #if USE_EXHALELIB_DLL
         exhaleDelete (&exhaleEnc);
@@ -528,7 +528,7 @@ int main (const int argc, char* argv[])
         }
         if (bwMax < bw) bwMax = bw;
         // the flush AU, add frame to header
-        if (mp4Writer.addFrameAU (outAuData, bw) != bw) // zero, no loudness update
+        if (mp4Writer.addFrameAU (outAuData, bw) != (int) bw) // no loudness update
         {
 #if USE_EXHALELIB_DLL
           exhaleDelete (&exhaleEnc);
diff --git a/src/lib/exhaleEnc.cpp b/src/lib/exhaleEnc.cpp
index 0439958..e690a5e 100644
--- a/src/lib/exhaleEnc.cpp
+++ b/src/lib/exhaleEnc.cpp
@@ -1238,7 +1238,7 @@ unsigned ExhaleEncoder::spectralProcessing ()  // complete ics_info(), calc TNS
           m_perCorrCurr[el] = (uint8_t) __max (prevPerCorr - allowedDiff, __min (prevPerCorr + allowedDiff, currPerCorr));
         }
 
-        if (s == steAnaStats * -1) coreConfig.stereoConfig = 2; // 2: side > mid, pred_dir=1
+        if ((int) s == steAnaStats * -1) coreConfig.stereoConfig = 2;  // 2: S>M, pred_dir=1
         if (s > (UCHAR_MAX * 3) / 4) coreConfig.stereoMode = 2; // 2: all, ms_mask_present=2
       }
       else if (nrChannels > 1) m_perCorrCurr[el] = 128; // update history with halfway value
diff --git a/src/makefile.base b/src/makefile.base
index 56ff5e0..6697ed0 100644
--- a/src/makefile.base
+++ b/src/makefile.base
@@ -42,7 +42,7 @@ RELEASE_OBJS  = $(OBJS:.o=.r.o)
 
 
 ## specification of compiler flags
-CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wno-sign-compare -Wshadow -D_FILE_OFFSET_BITS=64
+CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wshadow -D_FILE_OFFSET_BITS=64 -std=c++11
 
 # setting of 32-bit compiler flags
 MM32?=0