From c458c13af74c74ab6af8877684b106436116b913 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 22 Jun 2013 16:15:41 +0100 Subject: [PATCH] XCode warning fixes. --- simgear/misc/tabbed_values.cxx | 3 +-- simgear/misc/tabbed_values.hxx | 2 -- simgear/package/unzip.c | 2 +- simgear/sound/sample_queue.hxx | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/simgear/misc/tabbed_values.cxx b/simgear/misc/tabbed_values.cxx index 07ed2063..5fa5f6ec 100644 --- a/simgear/misc/tabbed_values.cxx +++ b/simgear/misc/tabbed_values.cxx @@ -26,8 +26,7 @@ #include "tabbed_values.hxx" -SGTabbedValues::SGTabbedValues(const char *line) : - _line(line) +SGTabbedValues::SGTabbedValues(const char *line) { assert(line); _fields.push_back(const_cast(line)); diff --git a/simgear/misc/tabbed_values.hxx b/simgear/misc/tabbed_values.hxx index 146ba368..a95cf7d1 100644 --- a/simgear/misc/tabbed_values.hxx +++ b/simgear/misc/tabbed_values.hxx @@ -45,8 +45,6 @@ public: long getLongAt(const unsigned int) const; private: const char* fieldAt(const unsigned int offset) const; - - const char* _line; /** this is first character of each field, if the field is empty it will be the tab character. It is lazily built as needed, so diff --git a/simgear/package/unzip.c b/simgear/package/unzip.c index 83ed5ec9..23f19ff5 100755 --- a/simgear/package/unzip.c +++ b/simgear/package/unzip.c @@ -1292,7 +1292,7 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len) return UNZ_PARAMERROR; - if ((pfile_in_zip_read_info->read_buffer == NULL)) + if (pfile_in_zip_read_info->read_buffer == NULL) return UNZ_END_OF_LIST_OF_FILE; if (len==0) return 0; diff --git a/simgear/sound/sample_queue.hxx b/simgear/sound/sample_queue.hxx index 781aaed5..2b11393a 100644 --- a/simgear/sound/sample_queue.hxx +++ b/simgear/sound/sample_queue.hxx @@ -91,7 +91,6 @@ public: private: std::string _refname; // sample name std::vector _buffers; - unsigned int _buffer; bool _playing; -- 2.39.5