From 8fc49bdce1cc17e937c670f1671290bb1273302f Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Mon, 26 Mar 2018 17:55:24 +1100
Subject: [PATCH] Fixed some stuff causing compiler errors

---
 src/editor/palette/empty_palette.hpp | 9 +++++----
 src/font/marked-up_text.cpp          | 3 +++
 src/help/help_topic_generators.hpp   | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/editor/palette/empty_palette.hpp b/src/editor/palette/empty_palette.hpp
index 58898cc15a6..49b4a6cad4d 100644
--- a/src/editor/palette/empty_palette.hpp
+++ b/src/editor/palette/empty_palette.hpp
@@ -27,9 +27,10 @@ class empty_palette : public common_palette {
 
 public:
 
-	empty_palette(display& gui) :
-		common_palette(gui.video()),
-		gui_(gui) {}
+	empty_palette(display& gui)
+		: common_palette(gui.video())
+		//, gui_(gui)
+	{}
 
 	//event handling
 	virtual bool mouse_click() { return false;}
@@ -78,7 +79,7 @@ public:
 	virtual void swap() override {}
 
 private:
-	display& gui_;
+	//display& gui_;
 };
 
 }
diff --git a/src/font/marked-up_text.cpp b/src/font/marked-up_text.cpp
index 1a8721c082f..dcd5a5b2cfb 100644
--- a/src/font/marked-up_text.cpp
+++ b/src/font/marked-up_text.cpp
@@ -77,6 +77,8 @@ bool is_cjk_char(const ucs4::char_t ch)
 		(ch >= 0xff00 && ch < 0xffef);
 }
 
+// Re-enable if we find use for these
+#if 0
 namespace {
 
 /*
@@ -169,5 +171,6 @@ inline bool break_after(const ucs4::char_t ch)
 }
 
 } // end of anon namespace
+#endif
 
 } // end namespace font
diff --git a/src/help/help_topic_generators.hpp b/src/help/help_topic_generators.hpp
index 9c1704d0ee0..058f579ba1c 100644
--- a/src/help/help_topic_generators.hpp
+++ b/src/help/help_topic_generators.hpp
@@ -39,12 +39,12 @@ public:
 
 class unit_topic_generator: public topic_generator
 {
-	const unit_type& type_;
+	//const unit_type& type_;
 	const std::string variation_;
 	typedef std::pair< std::string, unsigned > item;
 	void push_header(std::vector< item > &row,  const std::string& name) const;
 public:
-	unit_topic_generator(const unit_type &t, std::string variation="") : type_(t), variation_(variation) {}
+	unit_topic_generator(const unit_type &/*t*/, std::string variation="") : /*type_(t),*/ variation_(variation) {}
 	virtual std::string operator()() const;
 };