summaryrefslogtreecommitdiff
path: root/src/shared/directoryentry.h
diff options
context:
space:
mode:
authorJeremy Rimpo <jrim@rimpo.org>2017-12-17 21:33:04 -0600
committerJeremy Rimpo <jrim@rimpo.org>2017-12-17 21:33:04 -0600
commit385a888c0bc8e5b4d4a6791e46eed3b5963c403a (patch)
tree276eb064a25143f9f8fb61206de08f90cf4f43fd /src/shared/directoryentry.h
parent7b45d807d6c2c8b5663ec53183e81e16a5baf739 (diff)
Implement file priority for loose files > archives
Diffstat (limited to 'src/shared/directoryentry.h')
-rw-r--r--src/shared/directoryentry.h6
1 files changed, 3 insertions, 3 deletions
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;