w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-10-30 20:40:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compiler warnings and error

Browse Source 
Clang++ detected some warnings that g++ did not.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6409 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-01-20 20:32:30 +00:00
parent 0f59c63ea6
commit a3c1c768ef
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Audio/BWFFile.cpp
View File

@ -602,7 +602,7 @@ void BWFFile::bext_time_reference (quint64 time_code)
auto BWFFile::bext_umid () const -> UMID auto BWFFile::bext_umid () const -> UMID
{ {
UMID umid {'\0'}; UMID umid {{'\0'}};
if (m_->bext ()) if (m_->bext ())
{ {
umid = m_->bext ()->umid_; umid = m_->bext ()->umid_;
@ -702,7 +702,7 @@ bool BWFFile::reset ()
m_->bext_.clear (); m_->bext_.clear ();
auto size = m_->data_size_ < 0 ? m_->file_.size () - m_->header_length_ : m_->data_size_; auto size = m_->data_size_ < 0 ? m_->file_.size () - m_->header_length_ : m_->data_size_;
m_->data_size_ = size; m_->data_size_ = size;
if (m_->header_length_ > 3 * sizeof (Desc) + 4 + sizeof (FormatChunk)) if (m_->header_length_ > qint64 (3 * sizeof (Desc) + 4 + sizeof (FormatChunk)))
{ {
// we need to move the data down // we need to move the data down
auto old_pos = m_->header_length_; auto old_pos = m_->header_length_;

3
CMakeLists.txt
View File

@ -642,9 +642,10 @@ endif (WSJT_GENERATE_DOCS)
# #
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-pragmas -std=c++11 -fexceptions -frtti") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11 -fexceptions -frtti")
if (NOT APPLE) if (NOT APPLE)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pragmas")
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fdata-sections -ffunction-sections") set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fdata-sections -ffunction-sections")
set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -fdata-sections -ffunction-sections") set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -fdata-sections -ffunction-sections")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fdata-sections -ffunction-sections") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fdata-sections -ffunction-sections")

1
SampleDownloader/FileNode.hpp
View File

@ -57,7 +57,6 @@ protected:
void download_finished (bool success) override; void download_finished (bool success) override;
private: private:
QNetworkAccessManager * network_manager_;
RemoteFile remote_file_; // active download RemoteFile remote_file_; // active download
bool block_sync_; bool block_sync_;