From da13bd9f04fd0f0e5b37d8a26e8ef39da2ec4564 Mon Sep 17 00:00:00 2001
From: Stuart Buchanan <stuart_d_buchanan@yahoo.co.uk>
Date: Sat, 10 Dec 2016 16:00:28 +0000
Subject: [PATCH] Fix minor compiler warnings

---
 simgear/props/props_test.cxx   |  4 ++--
 simgear/sound/sample_group.cxx | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/simgear/props/props_test.cxx b/simgear/props/props_test.cxx
index 9a5a19cc..a6f41b8b 100644
--- a/simgear/props/props_test.cxx
+++ b/simgear/props/props_test.cxx
@@ -391,7 +391,7 @@ void test_addChild()
 }
 
 
-bool ensureNListeners(SGPropertyNode* node, unsigned int n)
+bool ensureNListeners(SGPropertyNode* node, int n)
 {
     if (node->nListeners() != n) {
         return false;
@@ -948,7 +948,7 @@ int main (int ac, char ** av)
     tiedPropertiesTest();
     tiedPropertiesListeners();
     testDeleterListener();
-    
+
     // disable test for the moment
    // testAliasedListeners();
 
diff --git a/simgear/sound/sample_group.cxx b/simgear/sound/sample_group.cxx
index 863cac1f..bbd38590 100644
--- a/simgear/sound/sample_group.cxx
+++ b/simgear/sound/sample_group.cxx
@@ -49,7 +49,7 @@ SGSampleGroup::SGSampleGroup ( SGSoundMgr *smgr,
                                const std::string &refname ):
     _smgr(smgr),
     _refname(refname),
-    _active(false), 
+    _active(false),
     _changed(false),
     _pause(false),
     _volume(1.0),
@@ -75,10 +75,10 @@ void SGSampleGroup::cleanup_removed_samples()
     unsigned int size = _removed_samples.size();
     for (unsigned int i=0; i<size; ) {
         SGSoundSample *sample = _removed_samples[i];
-        
+
         _smgr->sample_stop(sample);
         bool stopped = _smgr->is_sample_stopped(sample);
-        
+
         if ( stopped ) {
             sample->stop();
             if (( !sample->is_queue() )&&
@@ -130,7 +130,7 @@ void SGSampleGroup::update( double dt ) {
     testForMgrError("start of update!!\n");
 
     cleanup_removed_samples();
-    
+
     // Update the position and orientation information for all samples.
     if ( _changed || _smgr->has_changed() ) {
         update_pos_and_orientation();
@@ -139,7 +139,6 @@ void SGSampleGroup::update( double dt ) {
 
     sample_map_iterator sample_current = _samples.begin();
     sample_map_iterator sample_end = _samples.end();
-    size_t i = 0;
     for ( ; sample_current != sample_end; ++sample_current ) {
         SGSoundSample *sample = sample_current->second;
 
@@ -395,4 +394,3 @@ bool SGSampleGroup::testForMgrError(std::string s)
     _smgr->testForError(s+" (sample group)", _refname);
     return false;
 }
-