From 385a888c0bc8e5b4d4a6791e46eed3b5963c403a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sun, 17 Dec 2017 21:33:04 -0600
Subject: Implement file priority for loose files > archives

---
 src/shared/directoryentry.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/shared/directoryentry.h')

diff --git a/src/shared/directoryentry.h b/src/shared/directoryentry.h
index 04b8782b..8dbedaf4 100644
--- a/src/shared/directoryentry.h
+++ b/src/shared/directoryentry.h
@@ -72,7 +72,7 @@ public:
 
   // gets the list of alternative origins (origins with lower priority than the primary one).
   // if sortOrigins has been called, it is sorted by priority (ascending)
-  const std::vector<int> &getAlternatives() const { return m_Alternatives; }
+  const std::vector<std::pair<int, std::wstring>> &getAlternatives() const { return m_Alternatives; }
 
   const std::wstring &getName() const { return m_Name; }
   int getOrigin() const { return m_Origin; }
@@ -96,9 +96,9 @@ private:
 
   Index m_Index;
   std::wstring m_Name;
-  int m_Origin;
+  int m_Origin = -1;
   std::wstring m_Archive;
-  std::vector<int> m_Alternatives;
+  std::vector<std::pair<int, std::wstring>> m_Alternatives;
   DirectoryEntry *m_Parent;
   mutable FILETIME m_FileTime;
 
-- 
cgit v1.3.1