Additional warning fixes; run brew update before brew install for hamlib

cjcliffe · Jan 11, 2019 · c57a123 · c57a123
1 parent e75387c
commit c57a123
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ addons:
       - freeglut3-dev
       - libhamlib-dev
 script: 
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install hamlib; fi
     - bash travis-ci/build_liquiddsp.sh
     - bash travis-ci/build_soapysdr.sh

diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
@@ -1301,7 +1301,9 @@ bool AppFrame::actionOnMenuAbout(wxCommandEvent& event) {
 
 bool AppFrame::actionOnMenuSettings(wxCommandEvent& event) {
 
-    if (event.GetId() >= wxID_ANTENNAS_BASE && event.GetId() < wxID_ANTENNAS_BASE + antennaNames.size()) {
+    int antennaIdMax = wxID_ANTENNAS_BASE + antennaNames.size();
+
+    if (event.GetId() >= wxID_ANTENNAS_BASE && event.GetId() < antennaIdMax) {
 
         wxGetApp().setAntennaName(antennaNames[event.GetId() - wxID_ANTENNAS_BASE]);
 
@@ -1720,7 +1722,9 @@ bool AppFrame::actionOnMenuRig(wxCommandEvent& event) {
         bManaged = true;
     }
 
-    if (event.GetId() >= wxID_RIG_SERIAL_BASE && event.GetId() < wxID_RIG_SERIAL_BASE + rigSerialRates.size()) {
+    int rigSerialIdMax = wxID_RIG_SERIAL_BASE + rigSerialRates.size();
+
+    if (event.GetId() >= wxID_RIG_SERIAL_BASE && event.GetId() < rigSerialIdMax) {
         int serialIdx = event.GetId() - wxID_RIG_SERIAL_BASE;
         rigSerialRate = rigSerialRates[serialIdx];
         resetRig = true;

diff --git a/src/forms/SDRDevices/SDRDevices.cpp b/src/forms/SDRDevices/SDRDevices.cpp
@@ -498,8 +498,9 @@ std::string SDRDevicesDialog::getSelectedChoiceOption(wxPGProperty* prop, const
     int choiceIndex = prop->GetChoiceSelection();
 
     if (arg.options.size() > 0) {
-
-        if (choiceIndex >= 0 && choiceIndex < arg.options.size()) {
+        int choiceMax = arg.options.size();
+
+        if (choiceIndex >= 0 && choiceIndex < choiceMax) {
             //normal selection
             optionName = arg.options[choiceIndex];
         } else {

diff --git a/src/modules/modem/digital/ModemFSK.cpp b/src/modules/modem/digital/ModemFSK.cpp
@@ -16,7 +16,7 @@ ModemBase *ModemFSK::factory() {
     return new ModemFSK;
 }
 
-int ModemFSK::checkSampleRate(long long sampleRate, int audioSampleRate) {
+int ModemFSK::checkSampleRate(long long sampleRate, int /* audioSampleRate */) {
     double minSps = pow(2.0,bps);
     double nextSps = (double(sampleRate) / double(sps));
     if (nextSps < minSps) {

diff --git a/src/process/SpectrumVisualProcessor.cpp b/src/process/SpectrumVisualProcessor.cpp
@@ -286,7 +286,7 @@ void SpectrumVisualProcessor::process() {
                 return;
             }
 
-            while (resampleBw / SPECTRUM_VZM >= bandwidth) {
+            while (resampleBw / SPECTRUM_VZM >= (long) bandwidth) {
                 resampleBw /= SPECTRUM_VZM;
             }