From 016dab39906226e2d6e4c597e5adabee5bbb6b69 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 12 May 2018 22:10:07 -0400 Subject: [PATCH] Fix more warnings, including stonesense --- depends/md5/CMakeLists.txt | 5 ++++- plugins/embark-assistant/finder_ui.cpp | 2 +- plugins/stonesense | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/depends/md5/CMakeLists.txt b/depends/md5/CMakeLists.txt index 69e0cf0b3..84cc24e14 100644 --- a/depends/md5/CMakeLists.txt +++ b/depends/md5/CMakeLists.txt @@ -1,3 +1,6 @@ project(dfhack-md5) ADD_LIBRARY(dfhack-md5 STATIC EXCLUDE_FROM_ALL md5.cpp md5wrapper.cpp) -IDE_FOLDER(dfhack-md5 "Depends") \ No newline at end of file +IDE_FOLDER(dfhack-md5 "Depends") +IF(UNIX) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing") +ENDIF() diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index 8f8a2599d..3f972635f 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -986,7 +986,7 @@ namespace embark_assist { void find() { // color_ostream_proxy out(Core::getInstance().getConsole()); - embark_assist::defs::finders finder; + embark_assist::defs::finders finder = {}; fields i = first_fields; while (true) { diff --git a/plugins/stonesense b/plugins/stonesense index b5c02d8a9..daa1ba70c 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit b5c02d8a979c6ff44640dbc76ae9bb8a4eb58708 +Subproject commit daa1ba70cb96afc3a0155870a1efaada6ce6ff59