Fixed some stuff causing compiler errors

wesnoth · Mar 26, 2018 · 8fc49bd · 8fc49bd
1 parent 28c35e7
commit 8fc49bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git 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 @@ class empty_palette : public common_palette {
 	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
@@ -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
@@ -39,12 +39,12 @@ class terrain_topic_generator: public topic_generator
 
 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;
 };