From 4b4077bab9fc468fbc748ebfd1bc50115a4570d4 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 6 Mar 2016 18:11:20 +0000
Subject: [PATCH] Fix template/helper confusion

Sync non-template types to make helper a better match.  Rename helper to
clarify code flow for readers.

Reported-by: kreatordxx <https://github.com/dxx-rebirth/dxx-rebirth/issues/183>
Fixes: ff67afd44092d0196ad5d5c6a028c59af25fa88e ("Propagate partial_range up into PHYSFSX_findFiles family")
---
 similar/main/menu.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp
index 0120c4ea6..6659e31db 100644
--- a/similar/main/menu.cpp
+++ b/similar/main/menu.cpp
@@ -150,13 +150,13 @@ using select_file_subfunction = int (*)(T *, const char *);
 }
 
 __attribute_nonnull()
-static int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_list, int select_dir, select_file_subfunction<void> when_selected, void *userdata);
+static int select_file_recursive2(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_list, int select_dir, select_file_subfunction<void> when_selected, void *userdata);
 
-template <typename T, std::size_t count>
+template <typename T>
 __attribute_nonnull()
-static int select_file_recursive(const char *title, const char *orig_path, const array<file_extension_t, count> &ext_list, int select_dir, select_file_subfunction<T> when_selected, T *userdata)
+static int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_list, int select_dir, select_file_subfunction<T> when_selected, T *userdata)
 {
-	return select_file_recursive(title, orig_path, ext_list, select_dir, reinterpret_cast<select_file_subfunction<void>>(when_selected), reinterpret_cast<void *>(userdata));
+	return select_file_recursive2(title, orig_path, ext_list, select_dir, reinterpret_cast<select_file_subfunction<void>>(when_selected), reinterpret_cast<void *>(userdata));
 }
 
 // Hide all menus
@@ -1765,7 +1765,7 @@ static int select_file_handler(listbox *menu,const d_event &event, browser *b)
 	return 0;
 }
 
-static int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, select_file_subfunction<void> when_selected, void *userdata)
+static int select_file_recursive2(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, select_file_subfunction<void> when_selected, void *userdata)
 {
 	const char *sep = PHYSFS_getDirSeparator();
 	char *p;
@@ -1854,7 +1854,7 @@ static int select_file_recursive(const char *title, const char *orig_path, const
 	DXX_MENUITEM(VERB, MENU, TXT " (browse...)", OPT)
 #else
 
-int select_file_recursive(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, int (*when_selected)(void *userdata, const char *filename), void *userdata)
+int select_file_recursive2(const char *title, const char *orig_path, const partial_range_t<const file_extension_t *> &ext_range, int select_dir, int (*when_selected)(void *userdata, const char *filename), void *userdata)
 {
 	return 0;
 }