Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 3 deletions

diff --git a/core/helpers.h b/core/helpers.h
index f0bfcf1b..df51c116 100644
--- a/core/helpers.h
+++ b/core/helpers.h
@@ -1,18 +1,26 @@
 #ifndef CORE_HELPERS_H
 #define CORE_HELPERS_H
 
+#include <utility>
 #include <string>
+#include <vector>
 
-#include "vector.h"
 
+struct PathNamePair {
+    std::string path, fname;
 
-struct PathNamePair { std::string path, fname; };
+    PathNamePair() = default;
+    template<typename T, typename U>
+    PathNamePair(T&& path_, U&& fname_)
+        : path{std::forward<T>(path_)}, fname{std::forward<U>(fname_)}
+    { }
+};
 const PathNamePair &GetProcBinary(void);
 
 extern int RTPrioLevel;
 extern bool AllowRTTimeLimit;
 void SetRTPriority(void);
 
-al::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
+std::vector<std::string> SearchDataFiles(const char *match, const char *subdir);
 
 #endif /* CORE_HELPERS_H */