Avoid auto return types; silence some unused variable warnings (nw)

src/devices/sound/tms5220.cpp

@@ -2094,6 +2094,14 @@ tms5220_device::tms5220_device(const machine_config &mconfig, const char *tag, d
 		m_data_cb(*this),
 		m_romclk_cb(*this)
 {
+	// prevent unused variable warnings
+	(void)m_PDC;
+	(void)m_CTL_pins;
+	(void)m_state;
+	(void)m_address;
+	(void)m_next_is_address;
+	(void)m_addr_bit;
+	(void)m_CTL_buffer;
 }
 
 tms5220_device::tms5220_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source)

src/emu/audit.h

@@ -141,7 +141,7 @@ public:
 	media_auditor(const driver_enumerator &enumerator);
 
 	// getters
-	const auto &records() const { return m_record_list; }
+	const simple_list<audit_record> &records() const { return m_record_list; }
 
 	// audit operations
 	summary audit_media(const char *validation = AUDIT_VALIDATE_FULL);

src/emu/cheat.h

@@ -295,7 +295,7 @@ public:
 	// getters
 	running_machine &machine() const { return m_machine; }
 	bool enabled() const { return !m_disabled; }
-	const auto &entries() const { return m_cheatlist; }
+	const simple_list<cheat_entry> &entries() const { return m_cheatlist; }
 
 	// setters
 	void set_enable(bool enable = true);

src/emu/debug/express.h

@@ -169,7 +169,7 @@ public:
 	symbol_table(void *globalref, symbol_table *parent = nullptr);
 
 	// getters
-	const auto &entries() const { return m_symlist; }
+	const tagged_list<symbol_entry> &entries() const { return m_symlist; }
 	symbol_table *parent() const { return m_parent; }
 	void *globalref() const { return m_globalref; }
 

src/emu/device.h

@@ -110,8 +110,9 @@ public:
 		device_t *first() const { return m_list.first(); }
 
 		// range iterators
-		auto begin() const { return m_list.begin(); }
+		using auto_iterator = simple_list<device_t>::auto_iterator;
-		auto end() const { return m_list.end(); }
+		auto_iterator begin() const { return m_list.begin(); }
+		auto_iterator end() const { return m_list.end(); }
 
 private:
 		// private helpers
@@ -137,6 +138,7 @@ private:
 		friend class device_state_interface;
 		friend class device_execute_interface;
 
+public:
 		class auto_iterator
 		{
 public:
@@ -146,14 +148,13 @@ public:
 			// required operator overrides
 			bool operator!=(const auto_iterator &iter) const { return m_current != iter.m_current; }
 			device_interface &operator*() const { return *m_current; }
-			const auto &operator++();
+			const auto_iterator &operator++();
 
 private:
 			// private state
 			device_interface *m_current;
 		};
 
-public:
 		// construction/destruction
 		interface_list() : m_head(nullptr), m_execute(nullptr), m_memory(nullptr), m_state(nullptr) { }
 
@@ -161,8 +162,8 @@ public:
 		device_interface *first() const { return m_head; }
 
 		// range iterators
-		auto begin() const { return auto_iterator(m_head); }
+		auto_iterator begin() const { return auto_iterator(m_head); }
-		auto end() const { return auto_iterator(nullptr); }
+		auto_iterator end() const { return auto_iterator(nullptr); }
 
 private:
 		device_interface *      m_head;         // head of interface list
@@ -684,7 +685,7 @@ inline device_t *device_t::siblingdevice(const char *tag) const
 
 
 // this operator requires device_interface to be a complete type
-inline const auto &device_t::interface_list::auto_iterator::operator++()
+inline const device_t::interface_list::auto_iterator &device_t::interface_list::auto_iterator::operator++()
 {
 	m_current = m_current->interface_next();
 	return *this;

src/emu/diimage.h

@@ -228,7 +228,7 @@ public:
 	const char *instance_name() const { return m_instance_name.c_str(); }
 	const char *brief_instance_name() const { return m_brief_instance_name.c_str(); }
 	bool uses_file_extension(const char *file_extension) const;
-	const auto &formatlist() const { return m_formatlist; }
+	const simple_list<image_device_format> &formatlist() const { return m_formatlist; }
 
 	bool load(const char *path);
 	bool open_image_file(emu_options &options);

src/emu/dislot.h

@@ -114,7 +114,7 @@ public:
 	static void static_set_option_clock(device_t &device, const char *option, UINT32 default_clock) { static_option(device, option)->m_clock = default_clock; }
 	bool fixed() const { return m_fixed; }
 	const char *default_option() const { return m_default_option; }
-	const auto &option_list() const { return m_options; }
+	const tagged_list<device_slot_option> &option_list() const { return m_options; }
 	device_slot_option *option(const char *name) const { if (name) return m_options.find(name); return nullptr; }
 	virtual std::string get_default_card_software() { return std::string(); }
 	device_t *get_card_device();

src/emu/disound.h

@@ -88,7 +88,7 @@ public:
 	virtual ~device_sound_interface();
 
 	// configuration access
-	const auto &routes() const { return m_route_list; }
+	const simple_list<sound_route> &routes() const { return m_route_list; }
 
 	// static inline configuration helpers
 	static sound_route &static_add_route(device_t &device, UINT32 output, const char *target, double gain, UINT32 input = AUTO_ALLOC_INPUT, UINT32 mixoutput = 0);

src/emu/distate.h

@@ -124,7 +124,7 @@ public:
 	virtual ~device_state_interface();
 
 	// configuration access
-	const auto &state_entries() const { return m_state_list; }
+	const simple_list<device_state_entry> &state_entries() const { return m_state_list; }
 
 	// state getters
 	UINT64 state_int(int index);

src/emu/ioport.h

@@ -1105,8 +1105,8 @@ public:
 	ioport_manager &manager() const;
 	running_machine &machine() const;
 	int modcount() const { return m_modcount; }
-	const auto &settings() const { return m_settinglist; }
+	const simple_list<ioport_setting> &settings() const { return m_settinglist; }
-	const auto &diplocations() const { return m_diploclist; }
+	const simple_list<ioport_diplocation> &diplocations() const { return m_diploclist; }
 
 	ioport_value mask() const { return m_mask; }
 	ioport_value defvalue() const { return m_defvalue; }
@@ -1291,7 +1291,7 @@ public:
 	ioport_manager &manager() const;
 	device_t &device() const { return m_device; }
 	running_machine &machine() const;
-	const auto &fields() const { return m_fieldlist; }
+	const simple_list<ioport_field> &fields() const { return m_fieldlist; }
 	const char *tag() const { return m_tag.c_str(); }
 	int modcount() const { return m_modcount; }
 	ioport_value active() const { return m_active; }
@@ -1477,7 +1477,7 @@ public:
 	bool has_bioses() const { return m_has_bioses; }
 
 	// type helpers
-	const auto &types() const { return m_typelist; }
+	const simple_list<input_type_entry> &types() const { return m_typelist; }
 	bool type_pressed(ioport_type type, int player = 0);
 	const char *type_name(ioport_type type, UINT8 player);
 	ioport_group type_group(ioport_type type, int player);

src/emu/memory.h

@@ -727,9 +727,9 @@ public:
 
 	// getters
 	running_machine &machine() const { return m_machine; }
-	const auto &banks() const { return m_banklist; }
+	const tagged_list<memory_bank> &banks() const { return m_banklist; }
-	const auto &regions() const { return m_regionlist; }
+	const tagged_list<memory_region> &regions() const { return m_regionlist; }
-	const auto &shares() const { return m_sharelist; }
+	const tagged_list<memory_share> &shares() const { return m_sharelist; }
 
 	// dump the internal memory tables to the given file
 	void dump(FILE *file);

src/emu/render.h

@@ -371,8 +371,11 @@ class render_primitive_list
 public:
 	// getters
 	render_primitive *first() const { return m_primlist.first(); }
-	auto begin() const { return m_primlist.begin(); }
+
-	auto end() const { return m_primlist.end(); }
+	// range iterators
+	using auto_iterator = simple_list<render_primitive>::auto_iterator;
+	auto_iterator begin() const { return m_primlist.begin(); }
+	auto_iterator end() const { return m_primlist.end(); }
 
 	// lock management
 	void acquire_lock() { m_lock.lock(); }
@@ -575,7 +578,7 @@ private:
 	static void overlay_scale(bitmap_argb32 &dest, bitmap_argb32 &source, const rectangle &sbounds, void *param);
 
 	// internal helpers
-	const auto &items() const { return m_itemlist; }
+	const simple_list<item> &items() const { return m_itemlist; }
 	item &add_generic(UINT8 type, float x0, float y0, float x1, float y1, rgb_t argb);
 	void recompute_lookups();
 	void update_palette();
@@ -870,8 +873,8 @@ public:
 
 	// getters
 	layout_file *next() const { return m_next; }
-	const auto &elements() const { return m_elemlist; }
+	const simple_list<layout_element> &elements() const { return m_elemlist; }
-	const auto &views() const { return m_viewlist; }
+	const simple_list<layout_view> &views() const { return m_viewlist; }
 
 private:
 	// internal state
@@ -1049,7 +1052,7 @@ public:
 	// targets
 	render_target *target_alloc(const internal_layout *layoutfile = nullptr, UINT32 flags = 0);
 	void target_free(render_target *target);
-	const auto &targets() const { return m_targetlist; }
+	const simple_list<render_target> &targets() const { return m_targetlist; }
 	render_target *first_target() const { return m_targetlist.first(); }
 	render_target *target_by_index(int index) const;
 

src/emu/softlist.h

@@ -111,7 +111,7 @@ public:
 	software_info &info() const { return m_info; }
 	const char *name() const { return m_name; }
 	const char *interface() const { return m_interface; }
-	const auto &featurelist() const { return m_featurelist; }
+	const simple_list<feature_list_item> &featurelist() const { return m_featurelist; }
 	rom_entry *romdata(unsigned int index = 0) { return (index < m_romdata.size()) ? &m_romdata[index] : nullptr; }
 
 	// helpers
@@ -150,10 +150,10 @@ public:
 	const char *parentname() const { return m_parentname; }
 	const char *year() const { return m_year; }
 	const char *publisher() const { return m_publisher; }
-	const auto &other_info() const { return m_other_info; }
+	const simple_list<feature_list_item> &other_info() const { return m_other_info; }
-	const auto &shared_info() const { return m_shared_info; }
+	const simple_list<feature_list_item> &shared_info() const { return m_shared_info; }
 	UINT32 supported() const { return m_supported; }
-	const auto &parts() const { return m_partdata; }
+	const simple_list<software_part> &parts() const { return m_partdata; }
 	software_part *first_part() const { return m_partdata.first(); }
 
 	// additional operations
@@ -202,7 +202,7 @@ public:
 	const char *description() { if (!m_parsed) parse(); return m_description; }
 	bool valid() { if (!m_parsed) parse(); return m_infolist.count() > 0; }
 	const char *errors_string() { if (!m_parsed) parse(); return m_errors.c_str(); }
-	const auto &get_info() { if (!m_parsed) parse(); return m_infolist; }
+	const simple_list<software_info> &get_info() { if (!m_parsed) parse(); return m_infolist; }
 
 	// operations
 	software_info *find(const char *look_for, software_info *prev = nullptr);

src/emu/sound.h

@@ -199,7 +199,7 @@ public:
 	// getters
 	running_machine &machine() const { return m_machine; }
 	int attenuation() const { return m_attenuation; }
-	const auto &streams() const { return m_stream_list; }
+	const simple_list<sound_stream> &streams() const { return m_stream_list; }
 	attotime last_update() const { return m_last_update; }
 	attoseconds_t update_attoseconds() const { return m_update_attoseconds; }
 

src/lib/util/coretmpl.h

@@ -40,6 +40,7 @@ typedef std::vector<UINT8> dynamic_buffer;
 template<class _ElementType>
 class simple_list final
 {
+public:
 	class auto_iterator
 	{
 public:
@@ -57,7 +58,6 @@ private:
 		_ElementType *m_current;
 	};
 
-public:
 	// we don't support deep copying
 	simple_list(const simple_list &) = delete;
 	simple_list &operator=(const simple_list &) = delete;
@@ -77,8 +77,8 @@ public:
 	bool empty() const noexcept { return m_count == 0; }
 
 	// range iterators
-	auto begin() const noexcept { return auto_iterator(m_head); }
+	auto_iterator begin() const noexcept { return auto_iterator(m_head); }
-	auto end() const noexcept { return auto_iterator(nullptr); }
+	auto_iterator end() const noexcept { return auto_iterator(nullptr); }
 
 	// remove (free) all objects in the list, leaving an empty list
 	void reset() noexcept

src/lib/util/options.h

@@ -133,8 +133,9 @@ public:
 	const char *command() const { return m_command.c_str(); }
 
 	// range iterators
-	auto begin() const { return m_entrylist.begin(); }
+	using auto_iterator = simple_list<entry>::auto_iterator;
-	auto end() const { return m_entrylist.end(); }
+	auto_iterator begin() const { return m_entrylist.begin(); }
+	auto_iterator end() const { return m_entrylist.end(); }
 
 	// configuration
 	void add_entry(const char *name, const char *description, UINT32 flags = 0, const char *defvalue = nullptr, bool override_existing = false);

src/lib/util/tagmap.h

@@ -59,8 +59,9 @@ public:
 	bool empty() const { return m_list.empty(); }
 
 	// range iterators
-	auto begin() const { return m_list.begin(); }
+	using auto_iterator = typename simple_list<_ElementType>::auto_iterator;
-	auto end() const { return m_list.end(); }
+	auto_iterator begin() const { return m_list.begin(); }
+	auto_iterator end() const { return m_list.end(); }
 
 	// remove (free) all objects in the list, leaving an empty list
 	void reset() { m_list.reset(); m_map.clear(); }